Reorganize imports

oyoyo/client.py

@@ -14,15 +14,17 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
+
 import socket
-import time
-import threading
-import traceback
-import sys
 import ssl
+import sys
+import threading
+import time
+import traceback
 
 from oyoyo.parse import parse_raw_irc_command
 
+
 # Adapted from http://code.activestate.com/recipes/511490-implementation-of-the-token-bucket-algorithm/
 class TokenBucket(object):
     """An implementation of the token bucket algorithm.
@@ -290,4 +292,3 @@ class IRCClient(object):
             if not next(conn):
                 self.stream_handler("Calling sys.exit()...", level="warning")
                 sys.exit()
-

oyoyo/ircevents.py

@@ -208,4 +208,3 @@ protocol_events = [
 ]
 
 all_events = generated_events + protocol_events + list(numeric_events.values())
-

oyoyo/parse.py

@@ -15,8 +15,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from oyoyo.ircevents import generated_events, protocol_events,\
+from oyoyo.ircevents import (all_events, generated_events,
-                            all_events, numeric_events
+                             numeric_events, protocol_events)
+
 
 # avoiding regex
 def parse_raw_irc_command(element):
@@ -87,4 +88,3 @@ def parse_nick(name):
         return (nick, mode, rest, None)
 
     return (nick, mode, user, host)
-

src/__init__.py

@@ -3,7 +3,7 @@ import datetime
 import time
 
 import botconfig
-from src import settings as var
+import src.settings as var
 
 # Todo: Allow game modes to be set via config
 

src/decorators.py

@@ -1,9 +1,10 @@
 import fnmatch
 from collections import defaultdict
 
-import botconfig
 from oyoyo.parse import parse_nick
-from src import settings as var
+
+import botconfig
+import src.settings as var
 from src import logger
 
 adminlog = logger("audit.log")

src/handler.py

@@ -5,12 +5,11 @@ import imp
 import socket
 import traceback
 
-import botconfig
 from oyoyo.parse import parse_nick
-from src import decorators
+
-from src import logger
+import botconfig
-from src import settings as var
+import src.settings as var
-from src import wolfgame
+from src import decorators, logger, wolfgame
 
 log = logger("errors.log")
 alog = logger(None)

src/settings.py

@@ -1,5 +1,10 @@
-from collections import defaultdict
+import fnmatch
 import math
+import random
+import sqlite3
+from collections import defaultdict
+
+import botconfig
 from src import events
 
 MINIMUM_WAIT = 60
@@ -252,9 +257,6 @@ QUIT_MESSAGES_NO_REVEAL = ("\u0002{0}\u0002 suddenly falls over dead before the
 GIF_CHANCE = 1/50
 FORTUNE_CHANCE = 1/25
 
-import botconfig
-import fnmatch
-import random
 
 RULES = (botconfig.CHANNEL + " channel rules: http://wolf.xnrand.com/rules")
 DENY = {}
@@ -995,8 +997,6 @@ class CharmingMode(GameMode):
 # Persistence
 
 
-# Load saved settings
-import sqlite3
 
 conn = sqlite3.connect("data.sqlite3", check_same_thread = False)
 c = conn.cursor()

src/wolfgame.py

@@ -19,31 +19,31 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from oyoyo.parse import parse_nick
-import src.settings as var
-import botconfig
-import traceback
-from src import decorators
-from datetime import datetime, timedelta
-from collections import defaultdict
-import threading
 import copy
-import time
-import re
-import string
-import sys
-import os
-import math
-import random
-import subprocess
-import signal
-from src import logger
-import urllib.request
-import sqlite3
 import itertools
+import math
+import os
+import random
+import re
+import signal
+import sqlite3
+import string
+import subprocess
+import sys
+import threading
+import time
+import traceback
+import urllib.request
+from collections import defaultdict
+from datetime import datetime, timedelta
+
+from oyoyo.parse import parse_nick
+
+import botconfig
+import src.settings as var
+from src import decorators, events, logger
 
 # done this way so that events is accessible in !eval (useful for debugging)
-from src import events
 Event = events.Event
 
 debuglog = logger("debug.log", write=False, display=False) # will be True if in debug mode

wolfbot.py

@@ -18,16 +18,20 @@
 # THE SOFTWARE.
 
 import sys
+
 if sys.version_info < (3, 2):
     print('Python 3.2 or newer is required to run the bot.')
     sys.exit(1)
 
-from oyoyo.client import IRCClient
-import botconfig
 import time
 import traceback
+
+from oyoyo.client import IRCClient
+
+import botconfig
 import src
-from src import handler
+
+handler = src.handler
 
 
 def main():