Mercurial > wikked

changeset 115:1aee72ba7028

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't crash if no `.wikirc` exists.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 18 Nov 2013 12:35:41 -0800
parents ef683c12f981
children b7950fa699f7
files wikked/wiki.py
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/wikked/wiki.py	Mon Nov 18 12:35:41 2013 -0800
+++ b/wikked/wiki.py	Mon Nov 18 12:35:41 2013 -0800
@@ -44,9 +44,6 @@
             return self.logger
         return logging.getLogger(__name__)
 
-    def config_factory(self):
-        return open(self.config_path)
-
     def fs_factory(self, config):
         return FileSystem(self.root, logger=self.logger_factory())
 
@@ -259,11 +256,7 @@
             os.path.dirname(__file__), 'resources', 'defaults.cfg')
         config = SafeConfigParser()
         config.readfp(open(default_config_path))
-
-        fp = parameters.config_factory()
-        config.readfp(fp)
-        fp.close()
-
+        config.read([parameters.config_path])
         return config