de-flake8'ed the rest of the source files in CBAPI

sensor_events.py in response is machine-generated, can't be linted properly -
exclude it in setup.cfg

Author: abowersox-cb

setup.cfg

@@ -5,6 +5,9 @@ description-file = README.md
 universal = 1
 
 [flake8]
+exclude =
+	src/cbapi/response/sensor_events.py,
+	.svn,CVS,.bzr,.hg,.git,__pycache__,.tox
 per-file-ignores = src/*/__init__.py:F401,F403
 max-doc-length = 120
 max-line-length = 120

src/cbapi/response/cblr.py

@@ -14,7 +14,8 @@ class LiveResponseSessionManager(CbLRManagerBase):
     cblr_session_cls = LiveResponseSession
 
     def _get_or_create_session(self, sensor_id):
-        sensor_sessions = [s for s in self._cb.get_object("{cblr_base}/session?active_only=true".format(cblr_base=self.cblr_base))
+        sensor_sessions = [s for s in self._cb.get_object("{cblr_base}/session?active_only=true"
+                                                          .format(cblr_base=self.cblr_base))
                            if s["sensor_id"] == sensor_id and s["status"] in ("pending", "active")]
 
         if len(sensor_sessions) > 0:
@@ -41,7 +42,7 @@ def _close_session(self, session_id):
             session_data = self._cb.get_object("{cblr_base}/session/{0}".format(session_id, cblr_base=self.cblr_base))
             session_data["status"] = "close"
             self._cb.put_object("{cblr_base}/session/{0}".format(session_id, cblr_base=self.cblr_base), session_data)
-        except:
+        except Exception:
             pass
 
     def _create_session(self, sensor_id):

src/cbapi/response/event.py

@@ -33,18 +33,18 @@ def __init__(self, cb, filename):
 
     def run(self):
         while not self._fp.closed:
-            l = self._fp.readline()
-            if l == "":
+            line = self._fp.readline()
+            if line == "":
                 # wait for new events
                 sleep(1)
                 continue
 
             try:
-                msg = json.loads(l)
+                msg = json.loads(line)
                 routing_key = msg.get("type")
                 # log.debug("Received message with routing key %s" % routing_key)
-                registry.eval_callback(routing_key, l, self._cb)
-            except:
+                registry.eval_callback(routing_key, line, self._cb)
+            except Exception:
                 pass
 
     def stop(self):
@@ -76,8 +76,8 @@ def __init__(self, cb, listening_address, **kwargs):
             certfile = kwargs.get("certfile", None)
             if not keyfile or not certfile:
                 raise CredentialError("Need to specify 'keyfile' and 'certfile' for HTTPS")
-            self.httpd.socket = ssl.wrap_socket (self.httpd.socket, certfile=certfile, keyfile=keyfile,
-                                                 server_side=True)
+            self.httpd.socket = ssl.wrap_socket(self.httpd.socket, certfile=certfile, keyfile=keyfile,
+                                                server_side=True)
 
     def run(self):
         self.httpd.serve_forever()
@@ -168,7 +168,7 @@ def on_connection_closed(self, connection, reply_code, reply_text):
             self._connection.ioloop.stop()
         else:
             log.warning('Connection closed, reopening in 5 seconds: (%s) %s',
-                           reply_code, reply_text)
+                        reply_code, reply_text)
             self._connection.add_timeout(5, self.reconnect)
 
     def reconnect(self):
@@ -231,7 +231,7 @@ def on_channel_closed(self, channel, reply_code, reply_text):
 
         """
         log.warning('Channel %i was closed: (%s) %s',
-                       channel, reply_code, reply_text)
+                    channel, reply_code, reply_text)
         self._connection.close()
 
     def setup_exchange(self, exchange_name):
@@ -282,7 +282,7 @@ def on_queue_declareok(self, method_frame):
         """
         for routing_key in self.ROUTING_KEYS:
             log.debug('Binding %s to %s with %s',
-                        self.EXCHANGE, self.QUEUE, routing_key)
+                      self.EXCHANGE, self.QUEUE, routing_key)
             self._channel.queue_bind(self.on_bindok, self.QUEUE,
                                      self.EXCHANGE, routing_key)
 
@@ -331,7 +331,7 @@ def on_consumer_cancelled(self, method_frame):
 
         """
         log.debug('Consumer was cancelled remotely, shutting down: %r',
-                    method_frame)
+                  method_frame)
         if self._channel:
             self._channel.close()
 
@@ -419,7 +419,7 @@ def on_message(self, unused_channel, basic_deliver, properties, body):
 
         """
         log.debug('Received message # %s with properties %s',
-                    basic_deliver.delivery_tag, properties)
+                  basic_deliver.delivery_tag, properties)
 
         registry.eval_callback(basic_deliver.routing_key, body, self._cb)