Merge branch 'master' of https://github.com/sbp/phenny

Conflicts: irc.py modules/oblique.py modules/startup.py
2012-02-17 22:10:05 -05:00
parent f1e523e9bd 6198b30d76
commit 09e26155ce
4 changed files with 7 additions and 3 deletions
--- a/irc.py
+++ b/irc.py
@@ -51,7 +51,7 @@ class Bot(asynchat.async_chat):
    #     asynchat.async_chat.push(self, *args, **kargs)

    def __write(self, args, text=None): 
-        # print '%r %r %r' % (self, args, text)
+        # print 'PUSH: %r %r %r' % (self, args, text)
        try: 
            if text is not None: 
                # 510 because CR and LF count too, as nyuszika7h points out