From 19397290d19821483f39ffddca62e075efe4db12 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@verizon.net>
Date: Sat, 24 Mar 2012 17:51:41 -0400
Subject: [PATCH] JSON -> YAML

---
 .gitignore          |  1 +
 earwigbot/config.py | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index edef0ae..f3cb28b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 # Ignore bot-specific config file:
 config.json
+config.yml
 
 # Ignore logs directory:
 logs/
diff --git a/earwigbot/config.py b/earwigbot/config.py
index 9358509..486b72a 100644
--- a/earwigbot/config.py
+++ b/earwigbot/config.py
@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 """
-EarwigBot's JSON Config File Parser
+EarwigBot's YAML Config File Parser
 
 This handles all tasks involving reading and writing to our config file,
 including encrypting and decrypting passwords and making a new config file from
@@ -45,11 +45,12 @@ Additionally, _BotConfig has some functions used in config loading:
                       variables; won't work if passwords aren't encrypted
 """
 
-import json
 import logging
 import logging.handlers
 from os import mkdir, path
 
+import yaml
+
 from earwigbot import blowfish
 
 __all__ = ["config"]
@@ -90,7 +91,7 @@ class _BotConfig(object):
     def __init__(self):
         self._script_dir = path.dirname(path.abspath(__file__))
         self._root_dir = path.split(self._script_dir)[0]
-        self._config_path = path.join(self._root_dir, "config.json")
+        self._config_path = path.join(self._root_dir, "config.yml")
         self._log_dir = path.join(self._root_dir, "logs")
         self._decryption_key = None
         self._data = None
@@ -105,12 +106,12 @@ class _BotConfig(object):
                        self._metadata]
 
     def _load(self):
-        """Load data from our JSON config file (config.json) into _config."""
+        """Load data from our JSON config file (config.yml) into _config."""
         filename = self._config_path
         with open(filename, 'r') as fp:
             try:
-                self._data = json.load(fp)
-            except ValueError as error:
+                self._data = yml.load(fp)
+            except yaml.YAMLError as error:
                 print "Error parsing config file {0}:".format(filename)
                 print error
                 exit(1)
@@ -158,7 +159,7 @@ class _BotConfig(object):
 
     def _make_new(self):
         """Make a new config file based on the user's input."""
-        encrypt = raw_input("Would you like to encrypt passwords stored in config.json? [y/n] ")
+        encrypt = raw_input("Would you like to encrypt passwords stored in config.yml? [y/n] ")
         if encrypt.lower().startswith("y"):
             is_encrypted = True
         else: