Merge pull request #481 from zackdever/pylint-1.5-changes

new pylint disables for pylint 1.5.1

Author: dpkp

kafka/consumer/kafka.py

@@ -661,7 +661,7 @@ def _reset_partition_offset(self, topic_partition):
             # Otherwise we should re-raise the upstream exception
             # b/c it typically includes additional data about
             # the request that triggered it, and we do not want to drop that
-            raise
+            raise # pylint: disable-msg=E0704
 
         (offset, ) = self.get_partition_offsets(topic, partition,
                                                 request_time_ms, max_num_offsets=1)

kafka/consumer/simple.py

@@ -166,7 +166,7 @@ def reset_partition_offset(self, partition):
             # Otherwise we should re-raise the upstream exception
             # b/c it typically includes additional data about
             # the request that triggered it, and we do not want to drop that
-            raise
+            raise # pylint: disable-msg=E0704
 
         # send_offset_request
         log.info('Resetting topic-partition offset to %s for %s:%d',

test/fixtures.py

@@ -8,7 +8,7 @@
 from six.moves import urllib
 import uuid
 
-from six.moves.urllib.parse import urlparse  # pylint: disable-msg=E0611
+from six.moves.urllib.parse import urlparse # pylint: disable-msg=E0611,F0401
 from test.service import ExternalService, SpawnedService
 from test.testutil import get_open_port