From 8f193c9953580548843fbeef204e62dbfd9c8dc2 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Sat, 24 Mar 2012 18:10:30 -0400 Subject: [PATCH] Fixing references to the config file --- earwigbot/config.py | 2 +- earwigbot/runner.py | 2 +- earwigbot/wiki/functions.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/earwigbot/config.py b/earwigbot/config.py index 486b72a..d86a909 100644 --- a/earwigbot/config.py +++ b/earwigbot/config.py @@ -110,7 +110,7 @@ class _BotConfig(object): filename = self._config_path with open(filename, 'r') as fp: try: - self._data = yml.load(fp) + self._data = yaml.load(fp) except yaml.YAMLError as error: print "Error parsing config file {0}:".format(filename) print error diff --git a/earwigbot/runner.py b/earwigbot/runner.py index 882b35f..2e03dfc 100644 --- a/earwigbot/runner.py +++ b/earwigbot/runner.py @@ -44,7 +44,7 @@ def run(): from earwigbot import main root_dir = raw_input() - config_path = path.join(root_dir, "config.json") + config_path = path.join(root_dir, "config.yml") log_dir = path.join(root_dir, "logs") is_encrypted = config.load(config_path, log_dir) if is_encrypted: diff --git a/earwigbot/wiki/functions.py b/earwigbot/wiki/functions.py index a870ee4..5444af2 100644 --- a/earwigbot/wiki/functions.py +++ b/earwigbot/wiki/functions.py @@ -63,8 +63,8 @@ def _get_cookiejar(): one is returned every time. The .cookies file is located in the project root, same directory as - config.json and earwigbot.py. If it doesn't exist, we will create the file - and set it to be readable and writeable only by us. If it exists but the + config.yml and bot.py. If it doesn't exist, we will create the file and set + it to be readable and writeable only by us. If it exists but the information inside is bogus, we will ignore it. This is normally called by _get_site_object_from_dict() (in turn called by