Changes to initialize text UI with config instance

pwman/__init__.py

@@ -96,7 +96,8 @@ def parser_options(formatter_class=argparse.HelpFormatter):
                               " one found in the config file, or the one given"
                               " as command line argument."))
     parser.add_argument('-O', '--output', dest='output',
-                        # default=os.path.expanduser('~/.pwman/pwman-newdb.db'),
+                        # default=os.path.expanduser(
+                        #'~/.pwman/pwman-newdb.db'),
                         help=("The name of the newly created database after "
                               "converting."))
     return parser
@@ -110,10 +111,10 @@ def get_conf_file(args):
 
     if not os.path.exists(args.cfile):
         config.set_config(default_config)
+        return config
     else:
-        config.load(args.cfile)
-
-    return config
+        configp = config.Config(args.cfile)
+        return configp
 
 
 def set_xsel(config, OSX):

pwman/ui/cli.py

@@ -41,7 +41,7 @@ class PwmanCliNew(cmd.Cmd, Aliases, BaseCommands):
     """
     Inherit from the BaseCommands and Aliases
     """
-    def __init__(self, db, hasxsel, callback):
+    def __init__(self, db, hasxsel, callback, config_parser=None):
         """
         initialize CLI interface, set up the DB
         connecion, see if we have xsel ...
@@ -49,8 +49,13 @@ class PwmanCliNew(cmd.Cmd, Aliases, BaseCommands):
         cmd.Cmd.__init__(self)
         self.intro = "%s %s (c) visit: %s" % (pwman.appname, pwman.version,
                                               pwman.website)
-        self._historyfile = config.get_value("Readline", "history")
+        if not config_parser:
+            self._historyfile = config.get_value("Readline", "history")
+        else:
+            self._historyfile = config_parser.get_value("Readline", "history")
+
         self.hasxsel = hasxsel
+        self.config = config_parser
         try:
             enc = CryptoEngine.get()
             enc.callback = callback()