diff --git a/README.md b/README.md new file mode 100644 index 0000000..dabb5cc --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +phenny +====== + +Warning +------- +This is an experimental port of phenny to python3. Do not expect it to work at +all. + +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 + +Enjoy! + +-- +Sean B. Palmer, http://inamidst.com/sbp/ +mutantmonkey, http://mutantmonkey.in diff --git a/README.txt b/README.txt deleted file mode 100644 index 4edf7c0..0000000 --- a/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -Installation &c. - -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/ diff --git a/irc.py b/irc.py index 9f3acd5..d7e911f 100755 --- a/irc.py +++ b/irc.py @@ -52,7 +52,6 @@ class Bot(asynchat.async_chat): def __write(self, args, text=None): # print '%r %r %r' % (self, args, text) - print(args, text) try: if text is not None: self.push((b' '.join(args) + b' :' + text)[:512] + b'\r\n') @@ -64,16 +63,20 @@ class Bot(asynchat.async_chat): def write(self, args, text=None): """This is a safe version of __write""" def safe(input): - input = input.replace('\n', '') - input = input.replace('\r', '') - return input.encode('utf-8') + if type(input) == str: + input = input.replace('\n', '') + input = input.replace('\r', '') + return input.encode('utf-8') + else: + return input try: args = [safe(arg) for arg in args] if text is not None: text = safe(text) self.__write(args, text) except Exception as e: - pass + raise + #pass def run(self, host, port=6667, ssl=False, ipv6=False): self.initiate_connect(host, port, ssl, ipv6) @@ -118,12 +121,10 @@ class Bot(asynchat.async_chat): def found_terminator(self): line = self.buffer - print(line) if line.endswith(b'\r'): line = line[:-1] self.buffer = b'' - # print line if line.startswith(b':'): source, line = line[1:].split(b' ', 1) else: source = None diff --git a/phenny b/phenny index cf4a02b..375ac80 100755 --- a/phenny +++ b/phenny @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 """ phenny - An IRC Bot Copyright 2008, Sean B. Palmer, inamidst.com