moving IRC class modules (base_command.py, connection.py, data.py, rc.py) to irc/classes/

irc/classes/__init__.py

@@ -0,0 +1,4 @@
+from base_command import *
+from connection import *
+from data import *
+from rc import *

irc/commands/afc_status.py

@@ -6,7 +6,7 @@ import json
 import re
 import urllib
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class AFCStatus(BaseCommand):
     def get_hooks(self):

irc/commands/calc.py

@@ -5,7 +5,7 @@
 import re
 import urllib
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class Calc(BaseCommand):
     def get_hooks(self):

irc/commands/chanops.py

@@ -2,7 +2,7 @@
 
 # Voice/devoice/op/deop users in the channel.
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 from core import config
 
 class ChanOps(BaseCommand):

irc/commands/git.py

@@ -2,9 +2,11 @@
 
 # Commands to interface with the bot's git repository; use '!git help' for sub-command list.
 
-import shlex, subprocess, re
+import shlex
+import subprocess
+import re
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 from core import config
 
 class Git(BaseCommand):

irc/commands/help.py

@@ -2,8 +2,7 @@
 
 # Generates help information.
 
-from irc.base_command import BaseCommand
-from irc.data import Data
+from irc.classes import BaseCommand, Data
 from irc import command_handler
 
 class Help(BaseCommand):

irc/commands/link.py

@@ -4,7 +4,7 @@
 
 import re
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class Link(BaseCommand):
     def get_hooks(self):

irc/commands/tasks.py

@@ -5,8 +5,7 @@
 import threading
 import re
 
-from irc.base_command import BaseCommand
-from irc.data import *
+from irc.classes import BaseCommand, Data, KwargParseException
 from wiki import task_manager
 from core import config
 

irc/commands/test.py

@@ -4,7 +4,7 @@
 
 import random
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class Test(BaseCommand):
     def get_hooks(self):

irc/frontend.py

@@ -13,8 +13,7 @@ from re import findall
 
 from core import config
 from irc import command_handler
-from irc.connection import *
-from irc.data import Data
+from irc.classes import Connection, Data, BrokenSocketException
 
 connection = None
 

irc/watcher.py

@@ -11,8 +11,7 @@ channels in the IRC frontend.
 """
 
 from core import config
-from irc.connection import *
-from irc.rc import RC
+from irc.classes import Connection, RC, BrokenSocketException
 from irc import watcher_logic
 
 frontend_conn = None