Pylint/PEP8 fixes

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

2 files changed, 42 insertions, 28 deletions

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: