Make settings global again

Author: HairyFotr

.gitignore

@@ -1,5 +1,6 @@
 src/error_log
 error_log
+tests/.cache/*
 venv/*
 *.pyc
 *~

src/handler.py

@@ -8,25 +8,25 @@
 import asyncore
 import asynchat
 
+import settings
 import logic
 
 
 class Bot(asynchat.async_chat):
 
-    def __init__(self, settings):
+    def __init__(self):
         asynchat.async_chat.__init__(self)
         self.known_users = {}
         self.buffer = ''
         self.set_terminator('\r\n')
-        self.settings = settings
         self.nick_num = 0
-        self.nick = self.settings.NICKS[self.nick_num]
+        self.nick = settings.NICKS[self.nick_num]
         self.logic = logic.BotLogic(self)
         self.ac_in_buffer_size = self.ac_out_buffer_size = 8192   # 2*default
         self.start_time = time()
 
     def print_debug(self, text):
-        if self.settings.DEBUG:
+        if settings.DEBUG:
             print(text)
 
     def write(self, text):
@@ -42,17 +42,17 @@ def say(self, text, channel):
         return line
 
     def set_nick(self):
-        self.nick = self.settings.NICKS[self.nick_num]
+        self.nick = settings.NICKS[self.nick_num]
         self.write('NICK %s' % self.nick)
 
     def next_nick(self):
-        self.nick_num = (self.nick_num + 1) % len(self.settings.NICKS)
+        self.nick_num = (self.nick_num + 1) % len(settings.NICKS)
         self.set_nick()
 
     def handle_connect(self):
         self.set_nick()
         self.write('USER %s iw 0 :%s' %
-                   (self.settings.IDENT, self.settings.REAL_NAME))
+                   (settings.IDENT, settings.REAL_NAME))
 
     def collect_incoming_data(self, data):
         self.buffer += data
@@ -81,7 +81,7 @@ def handler(signal, frame):
             pass
 
         self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.connect((self.settings.IRC_SERVER, self.settings.IRC_PORT))
+        self.connect((settings.IRC_SERVER, settings.IRC_PORT))
 
         random.seed()
         # set the signal handler for shouting random messages

src/logic.py

@@ -7,6 +7,8 @@
 from plugins.psywerx_groups import PsywerxGroups
 from plugins.psywerx_karma import PsywerxKarma
 
+import settings
+
 
 class BotLogic(object):
 
@@ -64,7 +66,7 @@ def self_input(self, channel, msg, line):
 
     def handle_end_motd(self, line):
         # after server MOTD, join desired channel
-        for channel in self.bot.settings.CHANNELS:
+        for channel in settings.CHANNELS:
             self.bot.known_users[channel] = {}
             self.bot.write('JOIN ' + channel)
 

src/main.py

@@ -5,13 +5,12 @@
 
 
 def run_bot():
-    import settings
     from handler import Bot
 
     while True:
         try:
             # initialize and run
-            botko = Bot(settings)
+            botko = Bot()
             botko.run()
 
         except Exception:

src/plugins/psywerx_groups.py

@@ -1,4 +1,5 @@
 from base import PsywerxPlugin
+import settings
 import re
 import json
 
@@ -67,7 +68,7 @@ def _handle_mentions(self, channel, nick, msg):
             if group[-1] == "'":
                 group = group[:-1]
 
-            if re.match(self.bot.settings.BOTS_REGEX, nick):
+            if re.match(settings.BOTS_REGEX, nick):
                 continue
 
             params = {'group': group}

tests/test_logic.py

@@ -6,14 +6,13 @@
 from handler import Bot
 from logic import BotLogic
 
-import settings
 import unittest
 
 
 class BotTest(unittest.TestCase):
 
     def setUp(self):
-        self.bot = Bot(settings)
+        self.bot = Bot()
         self.logic = BotLogic(self.bot)
 
     def test_parse_priv_msg(self):