From 83d64251af6c857822c366587af338f3d56abbca Mon Sep 17 00:00:00 2001 From: moneromooo Date: Thu, 1 Jan 2015 11:42:06 +0000 Subject: [PATCH] Move irc to ircutils to not conflict with new irc module --- tipbot.py | 2 +- tipbot/command_manager.py | 2 +- tipbot/modules/irc.py | 4 ++-- tipbot/modules/tipping.py | 2 +- tipbot/modules/withdraw.py | 2 +- tipbot/utils.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tipbot.py b/tipbot.py index 3c80648..6e7facc 100644 --- a/tipbot.py +++ b/tipbot.py @@ -26,7 +26,7 @@ import tipbot.coinspecs as coinspecs import tipbot.config as config from tipbot.log import log_error, log_warn, log_info, log_log from tipbot.utils import * -from tipbot.irc import * +from tipbot.ircutils import * from tipbot.redisdb import * from tipbot.command_manager import * diff --git a/tipbot/command_manager.py b/tipbot/command_manager.py index d122022..986d351 100644 --- a/tipbot/command_manager.py +++ b/tipbot/command_manager.py @@ -11,7 +11,7 @@ import tipbot.config as config from tipbot.utils import * -from tipbot.irc import * +from tipbot.ircutils import * commands = dict() calltable=dict() diff --git a/tipbot/modules/irc.py b/tipbot/modules/irc.py index 5e0a1db..268d32b 100644 --- a/tipbot/modules/irc.py +++ b/tipbot/modules/irc.py @@ -14,7 +14,7 @@ import string import tipbot.config as config from tipbot.log import log_error, log_warn, log_info, log_log from tipbot.utils import * -from tipbot.irc import * +from tipbot.ircutils import * from tipbot.command_manager import * def JoinChannel(nick,chan,cmd): @@ -41,7 +41,7 @@ def PartChannel(nick,chan,cmd): def QuitIRC(nick,chan,cmd): msg = "" - for w in cmd[:1]: + for w in cmd[1:]: msg = msg + " " + w Quit(msg) diff --git a/tipbot/modules/tipping.py b/tipbot/modules/tipping.py index 4b56534..f45cc60 100644 --- a/tipbot/modules/tipping.py +++ b/tipbot/modules/tipping.py @@ -23,7 +23,7 @@ import tipbot.config as config from tipbot.log import log_error, log_warn, log_info, log_log import tipbot.coinspecs as coinspecs from tipbot.utils import * -from tipbot.irc import * +from tipbot.ircutils import * from tipbot.command_manager import * from tipbot.redisdb import * diff --git a/tipbot/modules/withdraw.py b/tipbot/modules/withdraw.py index eb0187d..a18436d 100644 --- a/tipbot/modules/withdraw.py +++ b/tipbot/modules/withdraw.py @@ -15,7 +15,7 @@ import string from tipbot.log import log_error, log_warn, log_info, log_log import tipbot.coinspecs as coinspecs from tipbot.utils import * -from tipbot.irc import * +from tipbot.ircutils import * from tipbot.redisdb import * from tipbot.command_manager import * diff --git a/tipbot/utils.py b/tipbot/utils.py index 7a9a234..fb749ea 100644 --- a/tipbot/utils.py +++ b/tipbot/utils.py @@ -16,7 +16,7 @@ import httplib import tipbot.config as config import tipbot.coinspecs as coinspecs from tipbot.log import log_error, log_warn, log_info, log_log -from tipbot.irc import * +from tipbot.ircutils import * from tipbot.redisdb import *