Fix linter errors

Author: borntyping

riemann_client/client.py

@@ -118,7 +118,7 @@ def events(self, *events):
 
         >>> client.events({'service': 'riemann-client', 'state': 'awesome'})
 
-         :param \*events: event dictionaries for :py:func:`create_event`
+         :param events: event dictionaries for :py:func:`create_event`
          :returns: The response message from Riemann
         """
         return self.send_events(self.create_event(e) for e in events)
@@ -128,7 +128,7 @@ def event(self, **data):
 
         >>> client.event(service='riemann-client', state='awesome')
 
-        :param \*\*data: keyword arguments used for :py:func:`create_event`
+        :param data: keyword arguments used for :py:func:`create_event`
         :returns: The response message from Riemann
         """
         return self.send_event(self.create_event(data))
@@ -281,7 +281,7 @@ def event(self, **data):
 
             >>> client.event(service='riemann-client', state='awesome')
 
-            :param \*\*data: keyword arguments used for :py:func:`create_event`
+            :param data: keyword arguments used for :py:func:`create_event`
             """
             self.send_events((self.create_event(data),))
 
@@ -291,7 +291,7 @@ def events(self, *events):
             >>> client.events({'service': 'riemann-client',
             >>>                'state': 'awesome'})
 
-             :param \*events: event dictionaries for :py:func:`create_event`
+             :param events: event dictionaries for :py:func:`create_event`
              :returns: The response message from Riemann
             """
             self.send_events(self.create_event(evd) for evd in events)
@@ -329,7 +329,7 @@ def flush(self):
                         self.connect()
                         response = (
                             super(AutoFlushingQueuedClient, self).flush())
-                    except:
+                    except Exception:
                         logger.warning("Socket error on flushing "
                                        "second attempt. Batch discarded.")
                         self.transport.disconnect()

riemann_client/command.py

@@ -96,7 +96,8 @@ def main(ctx, host, port, transport_type, timeout, ca_certs):
               help="Event tag (multiple)")
 @click.option('-l', '--ttl', type=click.FLOAT,
               help="Event time to live in seconds")
-@click.option('-a', '--attr', '--attribute', 'attribute', type=Pair(), multiple=True,
+@click.option('-a', '--attr', '--attribute', 'attribute',
+              type=Pair(), multiple=True,
               help="Event attribute (key=value, multiple)")
 @click.option('-m', '--metric', '--metric_f', 'metric_f', type=click.FLOAT,
               help="Event metric (uses metric_f)")

tests/test_riemann_command.py

@@ -11,13 +11,17 @@
 def run_cli(args):
     args = [u'-T', u'none'] + list(args)
     runner = click.testing.CliRunner()
-    result = runner.invoke(riemann_client.command.main, args, catch_exceptions=False)
+    result = runner.invoke(
+        riemann_client.command.main,
+        args,
+        catch_exceptions=False,
+    )
     assert result.exit_code == 0
     return result
 
 
 def strip(string):
-    return re.sub(u'\s+', u'', string)
+    return re.sub(u'\\s+', u'', string)
 
 
 def assert_output_eq(args, expected):

tests/test_riemann_transport.py

@@ -9,11 +9,11 @@
 
 
 class FakeSocket(object):
-        def __init__(self):
-            self.data = [b'hello', b'world', b'']
+    def __init__(self):
+        self.data = [b'hello', b'world', b'']
 
-        def recv(self, bufsize):
-            return self.data.pop(0)
+    def recv(self, bufsize):
+        return self.data.pop(0)
 
 
 def test_socket_recvall():