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

new pylint disables for pylint 1.5.1

3 files changed, 3 insertions, 3 deletions

diff --git a/kafka/consumer/kafka.py b/kafka/consumer/kafka.py
index 2141101..21b2bf6 100644
--- a/kafka/consumer/kafka.py
+++ b/kafka/consumer/kafka.py
@@ -661,7 +661,7 @@ class KafkaConsumer(object):
             # 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)
diff --git a/kafka/consumer/simple.py b/kafka/consumer/simple.py
index aad229a..7c63246 100644
--- a/kafka/consumer/simple.py
+++ b/kafka/consumer/simple.py
@@ -166,7 +166,7 @@ class SimpleConsumer(Consumer):
             # 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',
diff --git a/test/fixtures.py b/test/fixtures.py
index 164d0d7..0ae1c1e 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -8,7 +8,7 @@ import time
 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