From 2ec39ddc34d19d125acb5f47ef572f58871fd09c Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Thu, 22 Sep 2011 18:15:42 -0400 Subject: [PATCH] Update readme, fix search --- README.md | 24 ++++++++++++++---------- modules/search.py | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index dabb5cc..00297e8 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,24 @@ phenny ====== -Warning -------- -This is an experimental port of phenny to python3. Do not expect it to work at -all. +This is an experimental port of phenny, a Python IRC bot, to Python3. Do not +expect it to work well or at all yet. + +Support for IPv6 has been added, and SSL support is in the works. + +Compatibility with existing phenny modules has been mostly retained, but they +will need to be updated to run on Python3 if they do not already. Installation ------------ -1. Run ./phenny - this creates a default config file -2. Edit ~/.phenny/default.py -3. Run ./phenny - this now runs phenny with your settings +1. Run `./phenny` - this creates a default config file +2. Edit `~/.phenny/default.py +3. Run `./phenny` - this now runs phenny with your settings Enjoy! --- -Sean B. Palmer, http://inamidst.com/sbp/ -mutantmonkey, http://mutantmonkey.in +Authors +------- +* Sean B. Palmer, http://inamidst.com/sbp/ +* mutantmonkey, http://mutantmonkey.in diff --git a/modules/search.py b/modules/search.py index 6106199..ef280ca 100755 --- a/modules/search.py +++ b/modules/search.py @@ -10,10 +10,10 @@ http://inamidst.com/phenny/ import re import web -class Grab(web.urllib.URLopener): +class Grab(web.urllib.request.URLopener): def __init__(self, *args): self.version = 'Mozilla/5.0 (Phenny)' - web.urllib.URLopener.__init__(self, *args) + web.urllib.request.URLopener.__init__(self, *args) self.addheader('Referer', 'https://github.com/sbp/phenny') def http_error_default(self, url, fp, errcode, errmsg, headers): return web.urllib.addinfourl(fp, [headers, errcode], "http:" + url)