Code cleanup

Author: ProfMobius

.idea/inspectionProfiles/Project_Default.xml

@@ -2,22 +2,20 @@
 import AsyncSocket
 import asyncore
 import ConfigParser
-import sets
 import DCCSocket
 import threading
 import datetime
 from IRCHandler import CmdHandler,CmdGenerator,Sender
 
 class BotBase(object):
-    #def __init__(self, host, port, nick, autoinvite, cmdchar):
     def __init__(self, configfile = None):
         self.configfile = configfile if configfile else 'bot.cfg'
         self.config     = ConfigParser.RawConfigParser()
         self.config.read(self.configfile)
 
         self.host       = self.getConfig('SERVER', 'HOST', '')
         self.port       = int(self.getConfig('SERVER', 'PORT', '6667'))
-        self.channels   = sets.Set(self.getConfig('SERVER','CHANNELS', "").split(';') if self.getConfig('SERVER','CHANNELS', "").strip() else [])
+        self.channels   = set(self.getConfig('SERVER','CHANNELS', "").split(';') if self.getConfig('SERVER','CHANNELS', "").strip() else [])
         self.nickAuth   = self.getConfig('SERVER', 'NICKAUTH',"PRIVMSG nickserv :acc {nick}")
         self.authRegex  = self.getConfig('SERVER', 'AUTHREGEX',"(?P<nick>.+) ACC (?P<level>[0-9])")
         self.floodLimit = float(self.getConfig('SERVER', 'FLOODLIMIT', "0.75"))
@@ -46,12 +44,12 @@ def __init__(self, configfile = None):
         # We collect the list of groups (<group> = <authorised commands separated by ;>)
         self.groups = {}
         for option in self.config.options('GROUPS'):
-            self.groups[option] = sets.Set(self.config.get('GROUPS',option).lower().split(';') if self.config.get('GROUPS',option).strip() else [])
+            self.groups[option] = set(self.config.get('GROUPS',option).lower().split(';') if self.config.get('GROUPS',option).strip() else [])
 
         # We collect the list of users (<user> = <groups authorised separated by ;>)
         self.authUsers = {}
         for option in self.config.options('USERS'):
-            self.authUsers[option] = sets.Set(self.config.get('USERS',option).lower().split(';') if self.config.get('USERS',option).strip() else [])        
+            self.authUsers[option] = set(self.config.get('USERS',option).lower().split(';') if self.config.get('USERS',option).strip() else [])
 
         self.logger.debug("Users  : %s"%self.authUsers)
         self.logger.debug("Groups : %s"%self.groups)
@@ -99,7 +97,7 @@ def adduser(self, bot, sender, dest, cmd, args):
             return
 
         if not user in self.authUsers:
-            self.authUsers[user] = sets.Set()
+            self.authUsers[user] = set()
 
         self.authUsers[user].add(group)
         bot.sendNotice(sender.nick, "Done")
@@ -139,7 +137,7 @@ def getusers(self, bot, sender, dest, cmd, args):
         for user,groupset in self.authUsers.items():
             for group in groupset:
                 if not group in groups:
-                    groups[group] = sets.Set()
+                    groups[group] = set()
                 groups[group].add(user)
 
         maxlen    = len(max(groups.keys(), key=len))
@@ -154,7 +152,7 @@ def addgroup(self, bot, sender, dest, cmd, args):
         cmd    = args[1].lower()
 
         if not group in self.groups:
-            self.groups[group] = sets.Set()
+            self.groups[group] = set()
 
         self.groups[group].add(cmd)
         bot.sendNotice(sender.nick, "Done")
@@ -193,7 +191,7 @@ def helpcmd(self, bot, sender, dest, cmd, args):
                 groups = self.authUsers[sender.nick.lower()]
                 if 'admin' in groups:
                     bot.sendNotice(sender.nick, formatstr%(cmd, cmdval['desc']))
-                elif len(groups.intersection(sets.Set(cmdval['groups']))) > 0:
+                elif len(groups.intersection(set(cmdval['groups']))) > 0:
                     bot.sendNotice(sender.nick, formatstr%(cmd, cmdval['desc']))
 
     # DCC Request command, in by default

.idea/workspace.xml

@@ -3,7 +3,7 @@
 import time
 import Queue
 import urllib
-from IRCHandler import CmdGenerator, Sender
+from IRCHandler import Sender
 
 EOL = "\r\n"
 CTCPTAG = chr(1)
@@ -109,7 +109,7 @@ def handle_accept(self):
                 sender = Sender("AnonUser_%04d!~AnonUser_%[email protected]"%(self.indexAnon, self.indexAnon))
                 self.bot.users[sender.nick] = sender
                 self.pending[targip] = sender
-                self.indexAnon = self.indexAnon + 1
+                self.indexAnon += 1
                 welcomeMsg.append("DCC Session activated")
                 welcomeMsg.append("You have been dropped to read-only because your IP couldn't be tied to a nick")
                 welcomeMsg.append("This might be due to a problem with your bouncer if you are using one")                

BotBase.py

@@ -2,7 +2,6 @@
 import Logger
 import re
 import traceback
-import sets
 import time
 
 EOL = "\r\n"
@@ -120,7 +119,7 @@ def conv_ip_long_std(cls, longip):
         return '.'.join(address)
 
     @classmethod
-    def conv_ip_std_long(self, stdip):
+    def conv_ip_std_long(cls, stdip):
         address = stdip.split('.')
         if len(address) != 4:
             return 0
@@ -179,7 +178,7 @@ def registerCommand(self, command, callback, groups, minarg, maxarg, desc = None
         self.commands[command] = {'command':command, 'callback':callback, 'groups':groups, 'minarg':minarg, 'maxarg':maxarg, 'desc':desc}
         for group in groups:
             if not group in self.bot.groups:
-                self.bot.groups[group]= sets.Set()
+                self.bot.groups[group]= set()
             self.bot.groups[group].add(command)
 
         self.bot.updateConfig()
@@ -250,7 +249,7 @@ def onNOTICE(self, sender, params):
         self.logger.debug("[S : %s] [M : %s]"%(sender.nick, " ".join(params)))        
 
         #We received a notice from NickServ. We check if it is an ACC notice
-        if (sender.nick.lower() == 'nickserv'):
+        if sender.nick.lower() == 'nickserv':
             reMatch = re.match(self.bot.authRegex, " ".join(params[1:])[1:])
             if reMatch:
                 #We check that the user exists in our tables, we setup the lvl value & unlock the command thread.
@@ -332,7 +331,7 @@ def onPRIVMSG(self, sender, params):
         msg  = ' '.join(params[1:])  #We stich the chat msg back together
         msg  = msg[1:]               #We remove the leading :
 
-        if (msg[0] == self.bot.cmdChar):
+        if msg[0] == self.bot.cmdChar:
             self.onCOMMAND(sender, dest, msg[1:])   #We remove the cmd symbol before passing the cmd to the bot
         elif msg[0] == CTCPTAG and msg[-1] == CTCPTAG:
             self.onCTCP(sender, dest, msg[1:-1].split())
@@ -421,7 +420,7 @@ def onCOMMAND(self, sender, dest, command):
         if sender.nick in self.bot.users and sender == self.bot.users[sender.nick]:
             self.logger.debug("Found user %s in current users"%sender.nick)
 
-            if self.bot.authtimeout > -1 and time.time() - self.bot.users[sender.nick].lastAuth > self.bot.authtimeout:
+            if -1 < self.bot.authtimeout < time.time() - self.bot.users[sender.nick].lastAuth:
                 self.bot.users[sender.nick].unauthenticate()
 
             # If current auth is not 3, we retry to authenticate the account but resending the request and resetting the flags
@@ -508,23 +507,23 @@ def threadedCommand(self, callback, cmd, bot, sender, dest, args):
     def onCTCP(self, sender, dest, msg):
         #self.logger.debug("[S : %s] [M : %s]"%(sender.nick, " ".join(params)))        
 
-        if (msg[0] == 'VERSION'):
+        if msg[0] == 'VERSION':
             self.bot.sendRaw(CmdGenerator.getNOTICE(sender.nick, "MCPBot v4.0 'You were not expecting me !' by ProfMobius"))
             self.handleEvents('Version', sender, msg)
 
-        elif (msg[0] == 'USERINFO'):
+        elif msg[0] == 'USERINFO':
             self.bot.sendRaw(CmdGenerator.getNOTICE(sender.nick, "MCPBot v4.0 'You were not expecting me !' by ProfMobius"))
             self.handleEvents('Userinfo', sender, msg)            
 
-        elif (msg[0] == 'FINGER'):
+        elif msg[0] == 'FINGER':
             self.bot.sendRaw(CmdGenerator.getNOTICE(sender.nick, "Don't do that !"))
             self.handleEvents('Finger', sender, msg)            
 
-        elif (msg[0] == 'DCC'):
+        elif msg[0] == 'DCC':
             if self.bot.dccActive:
                 self.onDCC(sender, dest, msg)
 
-        elif (msg[0] == 'TIME' and len(msg) > 1):
+        elif msg[0] == 'TIME' and len(msg) > 1:
             self.bot.usersInfo[sender.nick].ctcpData['TIME'] = ' '.join(msg[1:])
             self.bot.usersInfo[sender.nick].ctcpEvent['TIME'].set()
 

DCCSocket.py

@@ -22,5 +22,5 @@ def getLogger(name, lognormal='botlog.log', logerror='errors.log'):
 
     return logger
 
-def setLoggerLevel(lvl):
-    logger.setLevel(lvl)
+#def setLoggerLevel(lvl):
+#    logger.setLevel(lvl)

IRCHandler.py

@@ -1,10 +1,10 @@
 from BotBase import BotBase
 from Database import Database
-import Logger
 
 class MCPBot(BotBase):
     def __init__(self):
         super(MCPBot, self).__init__()
+
         self.dbhost = self.getConfig('DATABASE', 'HOST', "")
         self.dbport = int(self.getConfig('DATABASE', 'PORT', "0"))
         self.dbuser = self.getConfig('DATABASE', 'USER', "")

Logger.py

@@ -1,5 +1,4 @@
 import BotBase
-import asyncore
 from IRCHandler import CmdGenerator
 
 def sendBastard(bot, sender, params):
@@ -16,9 +15,9 @@ def sayHello2(bot, sender, dest, cmd, args):
 def whois(bot, sender, dest, cmd, args):
     bot.sendRaw(CmdGenerator.getWHOIS(args[0]))
 
-bot = BotBase.BotBase()
-bot.registerEventKick(sendBastard)
+botBase = BotBase.BotBase()
+botBase.registerEventKick(sendBastard)
 #bot.registerEventJoin(sayHello)
-bot.registerCommand('test', sayHello2, None, 0, 0, None)
-bot.registerCommand('whois', whois, None, 1, 1, None)
-bot.run()
+botBase.registerCommand('test', sayHello2, None, 0, 0, None)
+botBase.registerCommand('whois', whois, None, 1, 1, None)
+botBase.run()