aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jesopo2018-08-30 11:40:41 +0100
committerGravatar jesopo2018-08-30 11:40:41 +0100
commit568d714fb2c17f67ebbff725efc8851f51ee870d (patch)
tree84750885d1f4a9382c01e8ee7390e318d00756e8
parentIRCServer.remove_own_mode doesn't take an "arg" (diff)
Return config from Config.load_config instead of setting it on bot
-rw-r--r--Config.py2
-rwxr-xr-xstart.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/Config.py b/Config.py
index 21a144cf..894c9eb0 100644
--- a/Config.py
+++ b/Config.py
@@ -14,4 +14,4 @@ class Config(object):
with open(self.full_location) as config_file:
parser = configparser.ConfigParser()
parser.read_string(config_file.read())
- self.bot.config = dict(parser["bot"].items())
+ return dict(parser["bot"].items())
diff --git a/start.py b/start.py
index 58ec6585..ae78855e 100755
--- a/start.py
+++ b/start.py
@@ -19,9 +19,10 @@ args = arg_parser.parse_args()
bot = IRCBot.Bot()
database = Database.Database(bot, args.database)
-config_object = Config.Config(bot, args.config)
+config = Config.Config(bot, args.config)
+
bot.database = database
-bot.config_object = config_object
+bot.config = config.load_config()
bot.args = args
bot.modules.load_modules()