Merge pull request #54 from coddingtonbear/cautious_configuration_han…

…dling

Raise an exception if we can't parse configuration; ignore simple config...

taskw/taskrc.py

@@ -48,6 +48,16 @@ def _add_to_tree(self, config, key, value):
         for part in key_parts[0:-1]:
             if part not in cursor:
                 cursor[part] = {}
+            # Unfortunately, collapsing our configuration into a dict
+            # has some downsides -- we can't store both of the following
+            # simultaneously::
+            #
+            #   color = on
+            #   color.header = something
+            #
+            # So we err on the side of storing more.
+            if not isinstance(cursor[part], dict):
+                cursor[part] = {}
             cursor = cursor[part]
         cursor[key_parts[-1]] = value
         return config

taskw/warrior.py

@@ -441,14 +441,7 @@ def __init__(
         super(TaskWarriorShellout, self).__init__(config_filename)
         self.config_overrides = config_overrides if config_overrides else {}
         self._marshal = marshal
-        try:
-            self.config = TaskRc(config_filename, overrides=config_overrides)
-        except:
-            logger.exception(
-                "Error encountered while loading configuration file "
-                "at '%s'",
-                config_filename,
-            )
+        self.config = TaskRc(config_filename, overrides=config_overrides)
 
     def get_configuration_override_args(self):
         config_overrides = self.DEFAULT_CONFIG_OVERRIDES.copy()