pep8

pwman/ui/cli.py

@@ -261,7 +261,6 @@ class PwmanCliOld(cmd.Cmd, HelpUI, BaseUI):
         except Exception, e:
             self.error(e)
 
-
     def do_edit(self, arg):
         ids = self.get_ids(arg)
         for i in ids:
@@ -390,7 +389,6 @@ class PwmanCliOld(cmd.Cmd, HelpUI, BaseUI):
             except Exception, e:
                 self.error(e)
 
-
     def do_delete(self, arg):
         ids = self.get_ids(arg)
         try:
@@ -815,9 +813,9 @@ class BaseCommands(PwmanCliOld):
         pwman> n {'leetify':False, 'numerics':True, 'special_chars':True}
         Password (Blank to generate):
         """
-        errmsg = """could not parse config override, please input some"""\
-                 + """ kind of dictionary, e.g.: n {'leetify':False, """\
-                 + """'numerics':True, 'special_chars':True}"""
+        errmsg = ("could not parse config override, please input some"
+                  " kind of dictionary, e.g.: n {'leetify':False, "
+                  " numerics':True, 'special_chars':True}")
         try:
             username = self.get_username()
             if args:
@@ -910,6 +908,7 @@ class Aliases(BaseCommands, PwmanCliOld):
     def do_n(self, arg):
         self.do_new(arg)
 
+
 class PwmanCliNew(Aliases, BaseCommands):
     """
     Inherit from the BaseCommands and Aliases

pwman/util/config.py

@@ -1,15 +1,15 @@
 #============================================================================
 # This file is part of Pwman3.
-# 
+#
 # Pwman3 is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2
-# as published by the Free Software Foundation; 
-# 
+# as published by the Free Software Foundation;
+#
 # Pwman3 is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with Pwman3; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -19,9 +19,10 @@
 # Copyright (C) 2006 Ivan Kelly <ivan@ivankelly.net>
 #============================================================================
 
-from ConfigParser import ConfigParser,ParsingError
+from ConfigParser import ConfigParser, ParsingError
 import copy
 
+
 class ConfigException(Exception):
     """Basic exception for config."""
     def __init__(self, message):
@@ -30,6 +31,7 @@ class ConfigException(Exception):
     def __str__(self):
         return "%s: %s" % (self.__class__.__name__, self.message)
 
+
 class ConfigNoConfigException(ConfigException):
     pass
 
@@ -37,86 +39,93 @@ _file = None
 _conf = dict()
 _defaults = dict()
 
+
 def set_defaults(defaults):
     global _defaults
     _defaults = defaults
 
+
 def add_defaults(defaults):
     global _defaults
     for n in defaults.keys():
-        if not _defaults.has_key(n):
+        if not n in _defaults:
             _defaults[n] = dict()
         for k in defaults[n].keys():
             _defaults[n][k] = defaults[n][k]
-    
+
+
 def get_value(section, name):
     global _conf, _defaults
     try:
         return _conf[section][name]
     except KeyError, e:
         pass
-    
+
     try:
         value = _defaults[section][name]
         set_value(section, name, value)
         return value
     except KeyError, e:
         pass
-    
+
     return ''
 
+
 def set_value(section, name, value):
     global _conf
-    if not _conf.has_key(section):
+    if not section in _conf:
         _conf[section] = dict()
     _conf[section][name] = value
 
+
 def get_conf():
     """
-    Get a copy of the config. 
-    Modifications have no effect. 
-    This function only serves for allowing applications 
+    Get a copy of the config.
+    Modifications have no effect.
+    This function only serves for allowing applications
     to output the config to the user"""
     global _conf
     return copy.deepcopy(_conf)
 
+
 def load(filename):
     """Load configuration from 'filename'."""
     global _conf, _file
 
     _file = filename
-        
+
     parser = ConfigParser()
 
     fp = None
     try:
         try:
             fp = open(filename, "r")
-            res = parser.readfp(fp)
-        except ParsingError,e:
+            parser.readfp(fp)
+        except ParsingError, e:
             raise ConfigException(e)
         except IOError, e:
             raise ConfigNoConfigException(e)
     finally:
         if (fp):
             fp.close()
-            
+
     for section in parser.sections():
         for option in parser.options(section):
             set_value(section, option, parser.get(section, option))
 
+
 def save(filename=None):
     """Save the configuration to 'filename'."""
     global _conf, _file
-    if filename == None:
+    if not filename:
         filename = _file
-        
+
     parser = ConfigParser()
     for key in _conf.keys():
         if not parser.has_section(key):
             parser.add_section(key)
         sectiondict = _conf[key]
-        if (type(sectiondict) == dict):
+        if isinstance(dict, sectiondict):
             for optionkey in sectiondict.keys():
                 parser.set(key, optionkey, sectiondict[optionkey])
     try:
@@ -125,6 +134,3 @@ def save(filename=None):
         fp.close()
     except IOError, e:
         raise ConfigException(str(e))
-        
-                
-