diff --git a/.gitignore b/.gitignore index c2547fa..e132f03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ logs/* build/* profiles/* +irctest.log \ No newline at end of file diff --git a/convo.pyc b/convo.pyc index f6ac506..af9073e 100644 Binary files a/convo.pyc and b/convo.pyc differ diff --git a/dataobjs.pyc b/dataobjs.pyc index 847eb57..c5afea2 100644 Binary files a/dataobjs.pyc and b/dataobjs.pyc differ diff --git a/generic.pyc b/generic.pyc index 2fe98c5..c06f528 100644 Binary files a/generic.pyc and b/generic.pyc differ diff --git a/irc.pyc b/irc.pyc index eacd58a..15a2525 100644 Binary files a/irc.pyc and b/irc.pyc differ diff --git a/memos.pyc b/memos.pyc index e3f1eb4..ed80cef 100644 Binary files a/memos.pyc and b/memos.pyc differ diff --git a/menus.pyc b/menus.pyc index 78b4664..0b97e7b 100644 Binary files a/menus.pyc and b/menus.pyc differ diff --git a/mispeller.pyc b/mispeller.pyc index c5eb90b..e86c8b3 100644 Binary files a/mispeller.pyc and b/mispeller.pyc differ diff --git a/oyoyo/__init__.pyc b/oyoyo/__init__.pyc index 28e3e80..f108745 100644 Binary files a/oyoyo/__init__.pyc and b/oyoyo/__init__.pyc differ diff --git a/oyoyo/client.py b/oyoyo/client.py index c45c39c..b2d5975 100644 --- a/oyoyo/client.py +++ b/oyoyo/client.py @@ -137,7 +137,6 @@ class IRCClient: ... g.next() """ - from datetime import * #logfile = open('irctest.log', 'a') try: diff --git a/oyoyo/client.pyc b/oyoyo/client.pyc index 3166c59..88704aa 100644 Binary files a/oyoyo/client.pyc and b/oyoyo/client.pyc differ diff --git a/oyoyo/cmdhandler.pyc b/oyoyo/cmdhandler.pyc index d97b3d1..57d62ba 100644 Binary files a/oyoyo/cmdhandler.pyc and b/oyoyo/cmdhandler.pyc differ diff --git a/oyoyo/helpers.pyc b/oyoyo/helpers.pyc index 86b2799..8a68fc5 100644 Binary files a/oyoyo/helpers.pyc and b/oyoyo/helpers.pyc differ diff --git a/oyoyo/ircevents.pyc b/oyoyo/ircevents.pyc index c83999f..51fd341 100644 Binary files a/oyoyo/ircevents.pyc and b/oyoyo/ircevents.pyc differ diff --git a/oyoyo/parse.pyc b/oyoyo/parse.pyc index 9095b24..79ddf44 100644 Binary files a/oyoyo/parse.pyc and b/oyoyo/parse.pyc differ diff --git a/parsetools.py b/parsetools.py index 474034a..8b5c757 100644 --- a/parsetools.py +++ b/parsetools.py @@ -230,8 +230,11 @@ smiledict = { ":rancorous:": "pc_rancorous.gif", ":apple:": "apple.gif", ":bathearst:": "bathearst.gif", + ":cathearst:": "cathearst.gif", + ":woeful:": "blacktear.gif", ":pleasant:": "pc_pleasant.gif", ":blueghost:": "blueslimer.gif", + ":slimer:": "slimer.gif", ":candycorn:": "candycorn.gif", ":cheer:": "cheer.gif", ":duhjohn:": "confusedjohn.gif", @@ -249,6 +252,7 @@ smiledict = { ":distraughtfirman": "pc_distraughtfirman.gif", ":distraught:": "pc_distraught.gif", ":insolent:": "pc_insolent.gif", + ":bemused:": "pc_bemused.gif", ":3:": "pckitty.gif", ":mystified:": "pc_mystified.gif", ":pranky:": "pc_pranky.gif", diff --git a/parsetools.pyc b/parsetools.pyc index b589134..68bb11c 100644 Binary files a/parsetools.pyc and b/parsetools.pyc differ diff --git a/smilies/slimer.gif b/smilies/slimer.gif new file mode 100644 index 0000000..1b9b48d Binary files /dev/null and b/smilies/slimer.gif differ