make grouchy linter happy

Author: Luke Bakken

riak/codecs/pbuf.py

@@ -774,7 +774,7 @@ def encode_timeseries_query(self, table, query, interpolations=None):
         return Msg(mc, req.SerializeToString(), rc)
 
     def decode_timeseries(self, resp, tsobj,
-            convert_timestamp=False):
+                          convert_timestamp=False):
         """
         Fills an TsObject with the appropriate data and
         metadata from a TsGetResp / TsQueryResp.
@@ -820,7 +820,7 @@ def decode_timeseries_col_type(self, col_type):
             raise RiakError(msg)
 
     def decode_timeseries_row(self, tsrow, tscols=None,
-            convert_timestamp=False):
+                              convert_timestamp=False):
         """
         Decodes a TsRow into a list
 

riak/codecs/ttb.py

@@ -139,7 +139,7 @@ def encode_timeseries_query(self, table, query, interpolations=None):
         return Msg(mc, encode(req), rc)
 
     def decode_timeseries(self, resp_ttb, tsobj,
-            convert_timestamp=False):
+                          convert_timestamp=False):
         """
         Fills an TsObject with the appropriate data and
         metadata from a TTB-encoded TsGetResp / TsQueryResp.
@@ -173,7 +173,7 @@ def decode_timeseries(self, resp_ttb, tsobj,
                 for resp_row in resp_rows:
                     tsobj.rows.append(
                         self.decode_timeseries_row(resp_row, resp_coltypes,
-                            convert_timestamp))
+                                                   convert_timestamp))
             else:
                 raise RiakError(
                     "Expected 3-tuple in response, got: {}".format(resp_data))

riak/tests/base.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
-import os
 import random
-import sys
 
 from riak.client import RiakClient
 from riak.tests import HOST, PROTOCOL, PB_PORT, HTTP_PORT, SECURITY_CREDS
@@ -46,15 +44,9 @@ def create_client(cls, host=None, http_port=None, pb_port=None,
             kwargs.update(cls.client_options)
 
         logger = logging.getLogger()
-        logger.debug("RiakClient(protocol='%s', host='%s', " +
-                            "pb_port='%d', http_port='%d', " +
-                            "credentials='%s', kwargs='%s')",
-                            protocol,
-                            host,
-                            pb_port,
-                            http_port,
-                            credentials,
-                            kwargs)
+        logger.debug("RiakClient(protocol='%s', host='%s', pb_port='%d', "
+                     "http_port='%d', credentials='%s', kwargs='%s')",
+                     protocol, host, pb_port, http_port, credentials, kwargs)
 
         return RiakClient(protocol=protocol,
                           host=host,

riak/tests/test_timeseries_pbuf.py

@@ -198,7 +198,7 @@ def test_decode_data_from_query(self):
                      'Timeseries not supported or RUN_TIMESERIES is 0')
 class TimeseriesPbufTests(IntegrationTestBase, unittest.TestCase):
     client_options = {'transport_options':
-            {'use_ttb': False, 'ts_convert_timestamp': True}}
+                      {'use_ttb': False, 'ts_convert_timestamp': True}}
 
     @classmethod
     def setUpClass(cls):

riak/tests/test_timeseries_ttb.py

@@ -12,8 +12,7 @@
 from riak.ts_object import TsObject
 from riak.codecs.ttb import TtbCodec
 from riak.util import str_to_bytes, \
-    unix_time_millis, datetime_from_unix_time_millis, \
-    is_timeseries_supported
+    unix_time_millis, is_timeseries_supported
 from riak.tests import RUN_TIMESERIES
 from riak.tests.base import IntegrationTestBase
 
@@ -125,7 +124,7 @@ def test_encode_data_for_put(self):
                      'Timeseries not supported or RUN_TIMESERIES is 0')
 class TimeseriesTtbTests(IntegrationTestBase, unittest.TestCase):
     client_options = {'transport_options':
-            {'use_ttb': True, 'ts_convert_timestamp': True}}
+                      {'use_ttb': True, 'ts_convert_timestamp': True}}
 
     @classmethod
     def setUpClass(cls):

riak/transports/tcp/stream.py

@@ -187,7 +187,7 @@ def next(self):
         keys = []
         for tsrow in response.keys:
             keys.append(self.codec.decode_timeseries_row(tsrow,
-                convert_timestamp=self._convert_timestamp))
+                        convert_timestamp=self._convert_timestamp))
 
         return keys
 

riak/transports/tcp/transport.py

@@ -155,7 +155,7 @@ def ts_get(self, table, key):
         resp_code, resp = self._request(msg, codec)
         tsobj = TsObject(self._client, table)
         codec.decode_timeseries(resp, tsobj,
-                self._ts_convert_timestamp)
+                                self._ts_convert_timestamp)
         return tsobj
 
     def ts_put(self, tsobj):
@@ -182,7 +182,7 @@ def ts_query(self, table, query, interpolations=None):
         resp_code, resp = self._request(msg, codec)
         tsobj = TsObject(self._client, table)
         codec.decode_timeseries(resp, tsobj,
-                self._ts_convert_timestamp)
+                                self._ts_convert_timestamp)
         return tsobj
 
     def ts_stream_keys(self, table, timeout=None):

riak/util.py

@@ -1,7 +1,6 @@
 from __future__ import print_function
 
 import datetime
-import decimal
 import sys
 import warnings