Pylint/PEP8 fixes

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

31 files changed, 120 insertions, 101 deletions

diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index 59059c240..c82a6d7fd 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -265,7 +265,7 @@ class Compare(AdminCmd):
         diff = []
         for line in difflib.unified_diff(lines1, lines2, **kwargs):
             if (line.startswith("--- ") or line.startswith("+++ ") or
-                line.startswith("@@ ")):
+                    line.startswith("@@ ")):
                 continue
             if lines is not None and len(diff) > lines:
                 diff.append("  ...")
@@ -363,7 +363,7 @@ class Compare(AdminCmd):
                 else:
                     el2 = elements2[elid]
                     if (el.getparent().get("name") !=
-                        el2.getparent().get("name")):
+                            el2.getparent().get("name")):
                         self.changed(
                             "Element %s was in bundle %s, "
                             "now in bundle %s" % (elid,
diff --git a/src/lib/Bcfg2/Server/CherrypyCore.py b/src/lib/Bcfg2/Server/CherrypyCore.py
index dbfe260f7..3cb0e291b 100644
--- a/src/lib/Bcfg2/Server/CherrypyCore.py
+++ b/src/lib/Bcfg2/Server/CherrypyCore.py
@@ -72,7 +72,7 @@ class CherrypyCore(NetworkCore):
             raise Exception("Unknown error processing XML-RPC request body")
 
         if (not self.check_acls(address[0], rpcmethod) or
-            not self.authenticate(cert, username, password, address)):
+                not self.authenticate(cert, username, password, address)):
             raise cherrypy.HTTPError(401)
 
     @cherrypy.expose
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 69d61580f..4eb151c29 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -1340,9 +1340,9 @@ class NetworkCore(Core):
         if self._database_available:
             db_settings = Bcfg2.settings.DATABASES['default']
             if (Bcfg2.Options.setup.daemon and
-                Bcfg2.Options.setup.daemon_uid and
-                db_settings['ENGINE'].endswith(".sqlite3") and
-                not os.path.exists(db_settings['NAME'])):
+                    Bcfg2.Options.setup.daemon_uid and
+                    db_settings['ENGINE'].endswith(".sqlite3") and
+                    not os.path.exists(db_settings['NAME'])):
                 # syncdb will create the sqlite database, and we're
                 # going to daemonize, dropping privs to a non-root
                 # user, so we need to chown the database after
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py
index dd3f46b07..6d6c82fab 100755
--- a/src/lib/Bcfg2/Server/Encryption.py
+++ b/src/lib/Bcfg2/Server/Encryption.py
@@ -592,7 +592,7 @@ class CLI(object):
                 tool.write(data)
 
             if (Bcfg2.Options.setup.remove and
-                tool.get_destination_filename(fname) != fname):
+                    tool.get_destination_filename(fname) != fname):
                 try:
                     os.unlink(fname)
                 except IOError:
diff --git a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
index 39d062604..b8eb06aa1 100644
--- a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
+++ b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
@@ -149,7 +149,7 @@ class Inotify(Pseudo, pyinotify.ProcessEvent):
         evt = Event(handleID, path, action)
 
         if (ievent.wd not in self.event_filter or
-            ievent.pathname in self.event_filter[ievent.wd]):
+                ievent.pathname in self.event_filter[ievent.wd]):
             self.events.append(evt)
 
     def AddMonitor(self, path, obj, handleID=None):
diff --git a/src/lib/Bcfg2/Server/FileMonitor/__init__.py b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
index ae42a3429..45a8d08fa 100644
--- a/src/lib/Bcfg2/Server/FileMonitor/__init__.py
+++ b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
@@ -188,7 +188,7 @@ class FileMonitor(Debuggable):
         """
         for pattern in self.ignore:
             if (fnmatch.fnmatch(event.filename, pattern) or
-                fnmatch.fnmatch(os.path.split(event.filename)[-1], pattern)):
+                    fnmatch.fnmatch(os.path.split(event.filename)[-1], pattern)):
                 self.debug_log("Ignoring %s" % event)
                 return True
         return False
diff --git a/src/lib/Bcfg2/Server/Info.py b/src/lib/Bcfg2/Server/Info.py
index 3a1ed7433..dd1fb1968 100644
--- a/src/lib/Bcfg2/Server/Info.py
+++ b/src/lib/Bcfg2/Server/Info.py
@@ -207,7 +207,7 @@ dir>.  This only handles file entries, and does not respect 'owner' or
         for struct in client_config:
             for entry in struct:
                 if (entry.tag == 'Path' and
-                    entry.get("type") not in self.blacklisted_types):
+                        entry.get("type") not in self.blacklisted_types):
                     failure = entry.get("failure")
                     if failure is not None:
                         print("Skipping entry %s:%s with bind failure: %s" %
@@ -265,7 +265,7 @@ class BuildAllMixin(object):
         """ the parent command """
         for cls in self.__class__.__mro__:
             if (cls != InfoCmd and cls != self.__class__ and
-                issubclass(cls, InfoCmd)):
+                    issubclass(cls, InfoCmd)):
                 return cls
 
     def run(self, setup):
@@ -366,8 +366,8 @@ class Automatch(InfoCmd):
 
         pfile = props.entries[setup.propertyfile]
         if (not Bcfg2.Options.setup.force and
-            not Bcfg2.Options.setup.automatch and
-            pfile.xdata.get("automatch", "false").lower() != "true"):
+                not Bcfg2.Options.setup.automatch and
+                pfile.xdata.get("automatch", "false").lower() != "true"):
             print("Automatch not enabled on %s" % setup.propertyfile)
         else:
             metadata = self.core.build_metadata(setup.hostname)
@@ -585,7 +585,7 @@ class Mappings(InfoCmd):
     def run(self, setup):
         data = [('Plugin', 'Type', 'Name')]
         for generator in self.core.plugins_by_type(
-            Bcfg2.Server.Plugin.Generator):
+                Bcfg2.Server.Plugin.Generator):
             etypes = setup.type or list(generator.Entries.keys())
             if setup.name:
                 interested = [(etype, [setup.name]) for etype in etypes]
diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py
index e3a0004a6..a2581e70b 100755
--- a/src/lib/Bcfg2/Server/Lint/Genshi.py
+++ b/src/lib/Bcfg2/Server/Lint/Genshi.py
@@ -39,8 +39,8 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
         for entryset in self.core.plugins['Cfg'].entries.values():
             for entry in entryset.entries.values():
                 if (self.HandlesFile(entry.name) and
-                    isinstance(entry, CfgGenshiGenerator) and
-                    not entry.template):
+                        isinstance(entry, CfgGenshiGenerator) and
+                        not entry.template):
                     self.check_template(entry.loader, entry.name,
                                         cls=NewTextTemplate)
 
@@ -49,5 +49,5 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
         loader = TemplateLoader()
         for entry in self.core.plugins['Bundler'].entries.values():
             if (self.HandlesFile(entry.name) and
-                entry.template is not None):
+                    entry.template is not None):
                 self.check_template(loader, entry.name, cls=MarkupTemplate)
diff --git a/src/lib/Bcfg2/Server/Lint/MergeFiles.py b/src/lib/Bcfg2/Server/Lint/MergeFiles.py
index 972475d91..cb14ca477 100644
--- a/src/lib/Bcfg2/Server/Lint/MergeFiles.py
+++ b/src/lib/Bcfg2/Server/Lint/MergeFiles.py
@@ -87,8 +87,8 @@ class MergeFiles(Bcfg2.Server.Lint.ServerPlugin):
             seqmatch = SequenceMatcher(None, fdata.data, cdata.data)
             # perform progressively more expensive comparisons
             if (seqmatch.real_quick_ratio() > Bcfg2.Options.setup.threshold and
-                seqmatch.quick_ratio() > Bcfg2.Options.setup.threshold and
-                seqmatch.ratio() > Bcfg2.Options.setup.threshold):
+                    seqmatch.quick_ratio() > Bcfg2.Options.setup.threshold and
+                    seqmatch.ratio() > Bcfg2.Options.setup.threshold):
                 rv.extend(
                     self._find_similar((cname, cdata), copy.copy(others)))
         return rv
diff --git a/src/lib/Bcfg2/Server/Lint/Metadata.py b/src/lib/Bcfg2/Server/Lint/Metadata.py
index 3c8f2831d..bf19c25fc 100644
--- a/src/lib/Bcfg2/Server/Lint/Metadata.py
+++ b/src/lib/Bcfg2/Server/Lint/Metadata.py
@@ -142,7 +142,7 @@ class Metadata(ServerPlugin):
     def default_is_profile(self):
         """ Ensure that the default group is a profile group. """
         if (self.metadata.default and
-            not self.metadata.groups[self.metadata.default].is_profile):
+                not self.metadata.groups[self.metadata.default].is_profile):
             xdata = \
                 self.metadata.groups_xml.xdata.xpath("//Group[@name='%s']" %
                                                      self.metadata.default)[0]
diff --git a/src/lib/Bcfg2/Server/Lint/Pkgmgr.py b/src/lib/Bcfg2/Server/Lint/Pkgmgr.py
index 6b718d8b5..3f0b9477c 100644
--- a/src/lib/Bcfg2/Server/Lint/Pkgmgr.py
+++ b/src/lib/Bcfg2/Server/Lint/Pkgmgr.py
@@ -26,7 +26,7 @@ class Pkgmgr(ServerlessPlugin):
                     if pkg.getparent().tag == 'Group':
                         grp = pkg.getparent().get('name')
                         if (type(grp) is not str and
-                            grp.getparent().tag == 'Group'):
+                                grp.getparent().tag == 'Group'):
                             pgrp = grp.getparent().get('name')
                         else:
                             pgrp = 'none'
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index cf7b51ecc..5d9e229fa 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -138,7 +138,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
         for source in self.core.plugins['Packages'].sources:
             if isinstance(source, Yum.YumSource):
                 if (not source.pulp_id and not source.url and
-                    not source.rawurl):
+                        not source.rawurl):
                     self.LintError(
                         "required-attrs-missing",
                         "A %s source must have either a url, rawurl, or "
@@ -152,7 +152,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
                     (source.ptype, self.RenderXML(source.xsource)))
 
             if (not isinstance(source, Apt.AptSource) and
-                source.recommended):
+                    source.recommended):
                 self.LintError(
                     "extra-attrs",
                     "The recommended attribute is not supported on %s sources:"
@@ -180,7 +180,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
         for bundle in self.core.plugins['Bundler'].entries.values():
             if self.HandlesFile(bundle.name) and bundle.template is None:
                 for path in bundle.xdata.xpath(
-                    "//*[substring(name(), 1, 5) = 'Bound']"):
+                        "//*[substring(name(), 1, 5) = 'Bound']"):
                     self.check_entry(path, bundle.name)
 
     def check_entry(self, entry, filename):
@@ -228,7 +228,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
                 fmt = required_attrs['__text__']
                 del required_attrs['__text__']
                 if (not entry.text and
-                    not entry.get('empty', 'false').lower() == 'true'):
+                        not entry.get('empty', 'false').lower() == 'true'):
                     self.LintError("required-attrs-missing",
                                    "Text missing for %s %s in %s: %s" %
                                    (tag, name, filename,
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index de7ae038a..2042382e7 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -182,7 +182,8 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
                     fpath, fname = path.split('/**/')
                     self.filelists[path] = []
                     for root, _, files in os.walk(
-                        os.path.join(Bcfg2.Options.setup.repository, fpath)):
+                            os.path.join(Bcfg2.Options.setup.repository,
+                                         fpath)):
                         self.filelists[path].extend([os.path.join(root, f)
                                                      for f in files
                                                      if f == fname])
diff --git a/src/lib/Bcfg2/Server/Lint/__init__.py b/src/lib/Bcfg2/Server/Lint/__init__.py
index c8cdb5be1..f918ad851 100644
--- a/src/lib/Bcfg2/Server/Lint/__init__.py
+++ b/src/lib/Bcfg2/Server/Lint/__init__.py
@@ -400,8 +400,8 @@ class CLI(object):
                 self.run_server_plugins()
 
         if (self.errorhandler.errors or
-            self.errorhandler.warnings or
-            Bcfg2.Options.setup.verbose):
+                self.errorhandler.warnings or
+                Bcfg2.Options.setup.verbose):
             print("%d errors" % self.errorhandler.errors)
             print("%d warnings" % self.errorhandler.warnings)
 
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 7a3d887fe..73ad24614 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -523,7 +523,7 @@ class XMLFileBacked(FileBacked):
         self.extra_monitors = []
 
         if ((create is not None or self.create not in [None, False]) and
-            not os.path.exists(self.name)):
+                not os.path.exists(self.name)):
             toptag = create or self.create
             self.logger.warning("%s does not exist, creating" % self.name)
             if hasattr(toptag, "getroottree"):
diff --git a/src/lib/Bcfg2/Server/Plugins/ACL.py b/src/lib/Bcfg2/Server/Plugins/ACL.py
index 3de3f767c..f059eb4f1 100644
--- a/src/lib/Bcfg2/Server/Plugins/ACL.py
+++ b/src/lib/Bcfg2/Server/Plugins/ACL.py
@@ -30,7 +30,7 @@ def rmi_names_equal(first, second):
         return False
     for i in range(len(first_parts)):
         if (first_parts[i] != second_parts[i] and first_parts[i] != '*' and
-            second_parts[i] != '*'):
+                second_parts[i] != '*'):
             return False
     return True
 
@@ -75,7 +75,7 @@ class IPACLFile(Bcfg2.Server.Plugin.XMLFileBacked):
             return self.actions["Defer"]
         for entry in self.entries:
             if (ip_matches(address, entry) and
-                rmi_names_equal(entry.get("method"), rmi)):
+                    rmi_names_equal(entry.get("method"), rmi)):
                 self.debug_log("ACL: %s requests %s: Found matching IP ACL, "
                                "%s" % (address, rmi, entry.tag.lower()))
                 return self.actions[entry.tag]
diff --git a/src/lib/Bcfg2/Server/Plugins/Bzr.py b/src/lib/Bcfg2/Server/Plugins/Bzr.py
index f91cc1943..886584477 100644
--- a/src/lib/Bcfg2/Server/Plugins/Bzr.py
+++ b/src/lib/Bcfg2/Server/Plugins/Bzr.py
@@ -23,7 +23,7 @@ class Bzr(Bcfg2.Server.Plugin.Version):
             working_tree = WorkingTree.open(Bcfg2.Options.setup.vcs_root)
             revision = str(working_tree.branch.revno())
             if (working_tree.has_changes(working_tree.basis_tree()) or
-                working_tree.unknowns()):
+                    working_tree.unknowns()):
                 revision += "+"
         except errors.NotBranchError:
             msg = "Failed to read Bazaar branch"
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index eea0a3456..5b32a91c0 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -690,7 +690,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
         rv = []
         for ent in self.entries.values():
             if (isinstance(ent, handler_type) and
-                (not ent.__specific__ or ent.specific.matches(metadata))):
+                    (not ent.__specific__ or ent.specific.matches(metadata))):
                 rv.append(ent)
         return rv
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Deps.py b/src/lib/Bcfg2/Server/Plugins/Deps.py
index fa821aad3..a4fe7aa91 100644
--- a/src/lib/Bcfg2/Server/Plugins/Deps.py
+++ b/src/lib/Bcfg2/Server/Plugins/Deps.py
@@ -33,7 +33,7 @@ class Deps(Bcfg2.Server.Plugin.PrioDir,
                 if tag.startswith('Bound'):
                     tag = tag[5:]
                 if ((tag, entry.get('name')) not in entries
-                    and not isinstance(entry, lxml.etree._Comment)):
+                        and not isinstance(entry, lxml.etree._Comment)):
                     entries.append((tag, entry.get('name')))
         entries.sort()
         entries = tuple(entries)
@@ -74,10 +74,10 @@ class Deps(Bcfg2.Server.Plugin.PrioDir,
                 prio = [int(m[0].priority) for m in matching]
                 if prio.count(max(prio)) > 1:
                     raise PluginExecutionError(
-                            "Deps: Found conflicting dependencies with same "
-                            "priority for %s:%s for %s: %s" %
-                            (entry.tag, entry.get("name"),
-                             metadata.hostname, [m[0].name for m in matching]))
+                        "Deps: Found conflicting dependencies with same "
+                        "priority for %s:%s for %s: %s" %
+                        (entry.tag, entry.get("name"),
+                         metadata.hostname, [m[0].name for m in matching]))
                 index = prio.index(max(prio))
                 matching = [matching[index]]
             if not matching:
diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
index 51eb6e09a..3d0336c36 100644
--- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py
+++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
@@ -87,7 +87,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin,
                 # for which update is false; we can't possibly do
                 # anything with the data we get from such a probe
                 if (entry.get('update', 'false').lower() == "false" and
-                    not cfg.has_generator(entry, metadata)):
+                        not cfg.has_generator(entry, metadata)):
                     continue
                 self.entries[metadata.hostname][path] = entry
                 probe = lxml.etree.Element('probe', name=path,
diff --git a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
index 90cbd083d..767ae6254 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
@@ -77,7 +77,7 @@ class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked):
     def Index(self):
         Bcfg2.Server.Plugin.XMLFileBacked.Index(self)
         if (self.core and
-            self.core.metadata_cache_mode in ['cautious', 'aggressive']):
+                self.core.metadata_cache_mode in ['cautious', 'aggressive']):
             self.core.metadata_cache.expire()
         self.patterns = []
         for entry in self.xdata.xpath('//GroupPattern'):
diff --git a/src/lib/Bcfg2/Server/Plugins/Ldap.py b/src/lib/Bcfg2/Server/Plugins/Ldap.py
index 6fc89b4f3..2be27c6d7 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ldap.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ldap.py
@@ -73,7 +73,7 @@ class Ldap(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Connector):
         Bcfg2.Server.Plugin.Connector.__init__(self)
         self.config = ConfigFile(self.data + "/config.py")
 
-    def debug_log(self, message, flag = None):
+    def debug_log(self, message, flag=None):
         if (flag is None) and self.debug_flag or flag:
             self.logger.error(message)
 
@@ -82,37 +82,39 @@ class Ldap(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Connector):
         try:
             data = {}
             self.debug_log("LdapPlugin debug: found queries " +
-                                              str(LDAP_QUERIES))
+                           str(LDAP_QUERIES))
             for QueryClass in LDAP_QUERIES:
                 query = QueryClass()
                 if query.is_applicable(metadata):
                     self.debug_log("LdapPlugin debug: processing query '" +
-                                                           query.name + "'")
+                                   query.name + "'")
                     data[query.name] = query.get_result(metadata)
                 else:
                     self.debug_log("LdapPlugin debug: query '" + query.name +
-                        "' not applicable to host '" + metadata.hostname + "'")
+                                   "' not applicable to host '" +
+                                   metadata.hostname + "'")
             return data
         except Exception:
             if hasattr(query, "name"):
                 logger.error("LdapPlugin error: " +
-                       "Exception during processing of query named '" +
-                                                      str(query.name) +
-                                     "', query results will be empty" +
-                                       " and may cause bind failures")
+                             "Exception during processing of query named '" +
+                             str(query.name) +
+                             "', query results will be empty" +
+                             " and may cause bind failures")
             for line in traceback.format_exception(sys.exc_info()[0],
                                                    sys.exc_info()[1],
                                                    sys.exc_info()[2]):
                 logger.error("LdapPlugin error: " +
-                                                 line.replace("\n", ""))
+                             line.replace("\n", ""))
             return {}
 
+
 class LdapConnection(object):
     """
     Connection to an LDAP server.
     """
-    def __init__(self, host = "localhost", port = 389,
-                       binddn = None, bindpw = None):
+    def __init__(self, host="localhost", port=389,
+                 binddn=None, bindpw=None):
         self.host = host
         self.port = port
         self.binddn = binddn
@@ -133,8 +135,8 @@ class LdapConnection(object):
         for attempt in range(RETRY_COUNT + 1):
             if attempt >= 1:
                 logger.error("LdapPlugin error: " +
-                    "LDAP server down (retry " + str(attempt) + "/" +
-                    str(RETRY_COUNT) + ")")
+                             "LDAP server down (retry " + str(attempt) + "/" +
+                             str(RETRY_COUNT) + ")")
             try:
                 if not self.conn:
                     self.init_conn()
@@ -154,6 +156,7 @@ class LdapConnection(object):
     def url(self):
         return "ldap://" + self.host + ":" + str(self.port)
 
+
 class LdapQuery(object):
     """
     Query referencing an LdapConnection and providing several
@@ -210,9 +213,10 @@ class LdapQuery(object):
             return self.result
         else:
             logger.error("LdapPlugin error: " +
-              "No valid connection defined for query " + str(self))
+                         "No valid connection defined for query " + str(self))
             return None
 
+
 class LdapSubQuery(LdapQuery):
     """
     SubQueries are meant for internal use only and are not added
@@ -243,5 +247,5 @@ class LdapSubQuery(LdapQuery):
             return self.process_result(metadata, **kwargs)
         else:
             logger.error("LdapPlugin error: " +
-              "No valid connection defined for query " + str(self))
+                         "No valid connection defined for query " + str(self))
             return None
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index db104b27e..073424c90 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -520,7 +520,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
         self.handlers = dict()
         self.groups_xml = self._handle_file("groups.xml")
         if (self._use_db and
-            os.path.exists(os.path.join(self.data, "clients.xml"))):
+                os.path.exists(os.path.join(self.data, "clients.xml"))):
             self.logger.warning("Metadata: database enabled but clients.xml "
                                 "found, parsing in compatibility mode")
             self.clients_xml = self._handle_file("clients.xml")
@@ -614,7 +614,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             elif alias:
                 for child in node:
                     if (child.tag == "Alias" and
-                        child.attrib["name"] == name):
+                            child.attrib["name"] == name):
                         return node
         return None
 
@@ -816,7 +816,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             if client.get('secure', 'false').lower() == 'true':
                 self.secure.append(clname)
             if (client.get('location', 'fixed') == 'floating' or
-                client.get('floating', 'false').lower() == 'true'):
+                    client.get('floating', 'false').lower() == 'true'):
                 self.floating.append(clname)
             if 'password' in client.attrib:
                 self.passwords[clname] = client.get('password')
@@ -1103,7 +1103,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
                        for p in self.group_membership[grpname]):
                     newgroups.add(grpname)
                     if (grpname in self.groups and
-                        self.groups[grpname].category):
+                            self.groups[grpname].category):
                         categories[self.groups[grpname].category] = grpname
             groups.update(newgroups)
             for grpname, predicates in self.negated_groups.items():
@@ -1112,7 +1112,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
                 if any(p(client, groups, categories) for p in predicates):
                     removegroups.add(grpname)
                     if (grpname in self.groups and
-                        self.groups[grpname].category):
+                            self.groups[grpname].category):
                         del categories[self.groups[grpname].category]
             groups.difference_update(removegroups)
         return (groups, categories)
@@ -1406,7 +1406,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
 
         # next we validate the address
         if (id_method != 'uuid' and
-            not self.validate_client_address(client, address)):
+                not self.validate_client_address(client, address)):
             return False
 
         if id_method == 'cert' and auth_type != 'cert+password':
@@ -1555,7 +1555,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
         for group in egroups:
             for parent in group.findall('Group'):
                 if (parent.get('name') not in gseen and
-                    include_group(parent.get('name'))):
+                        include_group(parent.get('name'))):
                     rv.append(gfmt % (parent.get('name'),
                                       parent.get('name')))
                     gseen.append(parent.get("name"))
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 5f66cb8a0..b98d3f419 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -575,7 +575,7 @@ class YumCollection(Collection):
                 # each pulp source can only have one arch, so we don't
                 # have to check the arch in url_map
                 if (source.pulp_id and
-                    source.pulp_id not in consumer['repoids']):
+                        source.pulp_id not in consumer['repoids']):
                     try:
                         consumerapi.bind(self.metadata.hostname,
                                          source.pulp_id)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 56285705a..4c685d427 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -342,7 +342,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         :type collection: Bcfg2.Server.Plugins.Packages.Collection.Collection
         """
         if (not Bcfg2.Options.setup.packages_metadata or
-            not Bcfg2.Options.setup.packages_resolver):
+                not Bcfg2.Options.setup.packages_resolver):
             # Config requests no resolver.  Note that disabling
             # metadata implies disabling the resolver.
             for struct in structures:
@@ -494,7 +494,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
                 if localfile not in keyfiles:
                     keyfiles.append(localfile)
                 if ((force_update and key not in keys) or
-                    not os.path.exists(localfile)):
+                        not os.path.exists(localfile)):
                     self.logger.info("Packages: Downloading and parsing %s" %
                                      key)
                     try:
diff --git a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
index c85bc7d41..c7d8986ed 100644
--- a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
+++ b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
@@ -97,7 +97,7 @@ class PNode(object):
             self.contents['Package'] = FuzzyDict()
         for pkg in data.findall('./Package'):
             if ('name' in pkg.attrib and
-                pkg.get('name') not in pdict['Package']):
+                    pkg.get('name') not in pdict['Package']):
                 pdict['Package'].add(pkg.get('name'))
             if pkg.get('name') is not None:
                 self.contents['Package'][pkg.get('name')] = {}
@@ -123,7 +123,7 @@ class PNode(object):
                         pkg.set('url', '%s/%s' % (pkg.get('uri'),
                                                   pkg.get('file')))
                 if (pkg.get('type') in self.splitters and
-                    pkg.get('file') is not None):
+                        pkg.get('file') is not None):
                     mdata = \
                         self.splitters[pkg.get('type')].match(pkg.get('file'))
                     if not mdata:
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 560546c70..568d1b3a0 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -357,7 +357,7 @@ class ProbeSet(Bcfg2.Server.Plugin.EntrySet):
     def HandleEvent(self, event):
         """ handle events on everything but probed.xml """
         if (event.filename != self.path and
-            not event.filename.endswith("probed.xml")):
+                not event.filename.endswith("probed.xml")):
             return self.handle_event(event)
 
     def get_probe_data(self, metadata):
@@ -384,7 +384,7 @@ class ProbeSet(Bcfg2.Server.Plugin.EntrySet):
             probe.set('name', os.path.basename(name))
             probe.set('source', self.plugin_name)
             if (metadata.version_info and
-                metadata.version_info > (1, 3, 1, '', 0)):
+                    metadata.version_info > (1, 3, 1, '', 0)):
                 try:
                     probe.text = entry.data.decode('utf-8')
                 except AttributeError:
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py
index 679e38ff9..6266e9fd2 100644
--- a/src/lib/Bcfg2/Server/Plugins/Svn.py
+++ b/src/lib/Bcfg2/Server/Plugins/Svn.py
@@ -60,7 +60,7 @@ class Svn(Bcfg2.Server.Plugin.Version):
                     self.ssl_server_trust_prompt
 
             if (Bcfg2.Options.setup.svn_user and
-                Bcfg2.Options.setup.svn_password):
+                    Bcfg2.Options.setup.svn_password):
                 self.client.callback_get_login = self.get_login
 
         self.logger.debug("Svn: Initialized svn plugin with SVN directory %s" %
diff --git a/src/lib/Bcfg2/Server/Reports/reports/models.py b/src/lib/Bcfg2/Server/Reports/reports/models.py
index 73adaaaaf..c7105fdd9 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/models.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/models.py
@@ -51,7 +51,7 @@ class ClientManager(models.Manager):
         yet been expired as of optional timestmamp argument. Timestamp
         should be a datetime object."""
 
-        if timestamp == None:
+        if timestamp is None:
             timestamp = datetime.now()
         elif not isinstance(timestamp, datetime):
             raise ValueError('Expected a datetime object')
@@ -62,8 +62,9 @@ class ClientManager(models.Manager):
             except ValueError:
                 return self.none()
 
-        return self.filter(Q(expiration__gt=timestamp) | Q(expiration__isnull=True),
-                           creation__lt=timestamp)
+        return self.filter(
+            Q(expiration__gt=timestamp) | Q(expiration__isnull=True),
+            creation__lt=timestamp)
 
 
 class Client(models.Model):
@@ -99,7 +100,8 @@ class InteractiveManager(models.Manager):
 
         if maxdate and not isinstance(maxdate, datetime):
             raise ValueError('Expected a datetime object')
-        return self.filter(id__in=self.get_interaction_per_client_ids(maxdate, active_only))
+        return self.filter(
+            id__in=self.get_interaction_per_client_ids(maxdate, active_only))
 
     def get_interaction_per_client_ids(self, maxdate=None, active_only=True):
         """
@@ -114,15 +116,17 @@ class InteractiveManager(models.Manager):
         cursor = connection.cursor()
         cfilter = "expiration is null"
 
-        sql = 'select reports_interaction.id, x.client_id from (select client_id, MAX(timestamp) ' + \
-                    'as timer from reports_interaction'
+        sql = 'select reports_interaction.id, x.client_id ' + \
+              'from (select client_id, MAX(timestamp) ' + \
+              'as timer from reports_interaction'
         if maxdate:
             if not isinstance(maxdate, datetime):
                 raise ValueError('Expected a datetime object')
             sql = sql + " where timestamp <= '%s' " % maxdate
             cfilter = "(expiration is null or expiration > '%s') and creation <= '%s'" % (maxdate, maxdate)
         sql = sql + ' GROUP BY client_id) x, reports_interaction where ' + \
-                    'reports_interaction.client_id = x.client_id AND reports_interaction.timestamp = x.timer'
+                    'reports_interaction.client_id = x.client_id AND ' + \
+                    'reports_interaction.timestamp = x.timer'
         if active_only:
             sql = sql + " and x.client_id in (select id from reports_client where %s)" % \
                 cfilter
@@ -136,14 +140,16 @@ class InteractiveManager(models.Manager):
 
 
 class Interaction(models.Model):
-    """Models each reconfiguration operation interaction between client and server."""
+    """Models each reconfiguration operation
+    interaction between client and server."""
     client = models.ForeignKey(Client, related_name="interactions")
-    timestamp = models.DateTimeField(db_index=True)  # Timestamp for this record
+    timestamp = models.DateTimeField(db_index=True)  # record timestamp
     state = models.CharField(max_length=32)  # good/bad/modified/etc
-    repo_rev_code = models.CharField(max_length=64)  # repo revision at time of interaction
+    # repository revision at the time of the latest interaction
+    repo_rev_code = models.CharField(max_length=64)
     goodcount = models.IntegerField()  # of good config-items
     totalcount = models.IntegerField()  # of total config-items
-    server = models.CharField(max_length=256)  # Name of the server used for the interaction
+    server = models.CharField(max_length=256)  # server used for interaction
     bad_entries = models.IntegerField(default=-1)
     modified_entries = models.IntegerField(default=-1)
     extra_entries = models.IntegerField(default=-1)
@@ -389,5 +395,3 @@ class InteractionMetadata(models.Model):
     profile = models.ForeignKey(Group, related_name="+")
     groups = models.ManyToManyField(Group)
     bundles = models.ManyToManyField(Bundle)
-
-
diff --git a/src/lib/Bcfg2/Server/Reports/updatefix.py b/src/lib/Bcfg2/Server/Reports/updatefix.py
index cb131c29d..c3fbcd2e9 100644
--- a/src/lib/Bcfg2/Server/Reports/updatefix.py
+++ b/src/lib/Bcfg2/Server/Reports/updatefix.py
@@ -16,9 +16,9 @@ def _merge_database_table_entries():
     find_cursor = connection.cursor()
     cursor.execute("""
     Select name, kind from reports_bad
-    union 
+    union
     select name, kind from reports_modified
-    union 
+    union
     select name, kind from reports_extra
     """)
     # this fetch could be better done
@@ -43,20 +43,26 @@ def _merge_database_table_entries():
         if entries_map.get(key, None):
             entry_id = entries_map[key]
         else:
-            find_cursor.execute("Select id from reports_entries where name=%s and kind=%s", key)
+            find_cursor.execute("Select id from reports_entries where "
+                                "name=%s and kind=%s", key)
             rowe = find_cursor.fetchone()
             entry_id = rowe[0]
-        insert_cursor.execute("insert into reports_entries_interactions \
-            (entry_id, interaction_id, reason_id, type) values (%s, %s, %s, %s)", (entry_id, row[3], row[2], row[4]))
+        insert_cursor.execute("insert into reports_entries_interactions "
+                              "(entry_id, interaction_id, reason_id, type) "
+                              "values (%s, %s, %s, %s)",
+                              (entry_id, row[3], row[2], row[4]))
 
 
 def _interactions_constraint_or_idx():
     '''sqlite doesn't support alter tables.. or constraints'''
     cursor = connection.cursor()
     try:
-        cursor.execute('alter table reports_interaction add constraint reports_interaction_20100601 unique (client_id,timestamp)')
+        cursor.execute('alter table reports_interaction '
+                       'add constraint reports_interaction_20100601 '
+                       'unique (client_id,timestamp)')
     except:
-        cursor.execute('create unique index reports_interaction_20100601 on reports_interaction (client_id,timestamp)')
+        cursor.execute('create unique index reports_interaction_20100601 '
+                       'on reports_interaction (client_id,timestamp)')
 
 
 def _populate_interaction_entry_counts():
@@ -67,13 +73,16 @@ def _populate_interaction_entry_counts():
                    3: 'extra_entries'}
 
     for type in list(count_field.keys()):
-        cursor.execute("select count(type), interaction_id " +
-                "from reports_entries_interactions where type = %s group by interaction_id" % type)
+        cursor.execute("select count(type), interaction_id "
+                       "from reports_entries_interactions "
+                       "where type = %s group by interaction_id" % type)
         updates = []
         for row in cursor.fetchall():
             updates.append(row)
         try:
-            cursor.executemany("update reports_interaction set " + count_field[type] + "=%s where id = %s", updates)
+            cursor.executemany("update reports_interaction set " +
+                               count_field[type] +
+                               "=%s where id = %s", updates)
         except Exception:
             e = sys.exc_info()[1]
             print(e)
@@ -106,9 +115,8 @@ _fixes = [_merge_database_table_entries,
           _interactions_constraint_or_idx,
           'alter table reports_reason add is_binary bool NOT NULL default False;',
           'alter table reports_reason add is_sensitive bool NOT NULL default False;',
-          update_noop, #_remove_table_column('reports_interaction', 'client_version'),
-          "alter table reports_reason add unpruned varchar(1280) not null default 'N/A';",
-]
+          update_noop,  # _remove_table_column('reports_interaction', 'client_version'),
+          "alter table reports_reason add unpruned varchar(1280) not null default 'N/A';"]
 
 # this will calculate the last possible version of the database
 lastversion = len(_fixes)
@@ -127,8 +135,10 @@ def rollupdate(current_version):
                 else:
                     _fixes[i]()
             except:
-                logger.error("Failed to perform db update %s" % (_fixes[i]), exc_info=1)
-            # since array start at 0 but version start at 1 we add 1 to the normal count
+                logger.error("Failed to perform db update %s" % (_fixes[i]),
+                             exc_info=1)
+            # since array start at 0 but version start at 1
+            # we add 1 to the normal count
             ret = InternalDatabaseVersion.objects.create(version=i + 1)
         return ret
     else:
diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py
index 6a3948f40..5e6846a44 100644
--- a/src/lib/Bcfg2/Server/SSLServer.py
+++ b/src/lib/Bcfg2/Server/SSLServer.py
@@ -118,7 +118,7 @@ class SSLServer(SocketServer.TCPServer, object):
         self.socket.settimeout(timeout)
         self.keyfile = keyfile
         if (keyfile is not None and
-            (keyfile == False or
+            (keyfile is False or
              not os.path.exists(keyfile) or
              not os.access(keyfile, os.R_OK))):
             msg = "Keyfile %s does not exist or is not readable" % keyfile
@@ -126,7 +126,7 @@ class SSLServer(SocketServer.TCPServer, object):
             raise Exception(msg)
         self.certfile = certfile
         if (certfile is not None and
-            (certfile == False or
+            (certfile is False or
              not os.path.exists(certfile) or
              not os.access(certfile, os.R_OK))):
             msg = "Certfile %s does not exist or is not readable" % certfile
@@ -134,7 +134,7 @@ class SSLServer(SocketServer.TCPServer, object):
             raise Exception(msg)
         self.ca = ca
         if (ca is not None and
-            (ca == False or
+            (ca is False or
              not os.path.exists(ca) or
              not os.access(ca, os.R_OK))):
             msg = "CA %s does not exist or is not readable" % ca