Flake8 and Py2 fixes

edenhill · edenhill · commit bd4baf5caa77 · 2021-02-26T16:21:51.000+01:00
diff --git a/src/confluent_kafka/admin/__init__.py b/src/confluent_kafka/admin/__init__.py
@@ -68,7 +68,10 @@ def __init__(self, name, value,
         self.is_default = bool(is_default)
         """Indicates whether the configuration property is using its default value."""
         self.is_sensitive = bool(is_sensitive)
-        """Indicates whether the configuration property value contains sensitive information (such as security settings), in which case .value is None."""
+        """
+        Indicates whether the configuration property value contains
+        sensitive information (such as security settings), in which
+        case .value is None."""
         self.is_synonym = bool(is_synonym)
         """Indicates whether the configuration property is a synonym for the parent configuration entry."""
         self.synonyms = synonyms
@@ -585,7 +588,7 @@ class GroupMember(object):
     `A Guide To The Kafka Protocol <https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol#AGuideToTheKafkaProtocol-GroupMembershipAPI>`_.
 
     This class is typically not user instantiated.
-    """
+    """  # noqa: E501
     def __init__(self,):
         self.id = None
         """Member id (generated by broker)."""
diff --git a/tests/integration/consumer/test_cooperative_rebalance_1.py b/tests/integration/consumer/test_cooperative_rebalance_1.py
@@ -33,24 +33,26 @@ def test_cooperative_rebalance_1(kafka_cluster):
                      'enable.auto.commit': 'false',
                      'auto.offset.reset': 'earliest',
                      'heartbeat.interval.ms': '2000',
-                     'session.timeout.ms': '6000', # minimum allowed by broker
+                     'session.timeout.ms': '6000',  # minimum allowed by broker
                      'max.poll.interval.ms': '6500'}
 
-    assign_count = 0
-    def on_assign(consumer, partitions):
-        nonlocal assign_count
-        assign_count += 1
-        assert 1 == len(partitions)
+    class RebalanceState:
+        def __init__(self):
+            self.assign_count = 0
+            self.revoke_count = 0
+            self.lost_count = 0
 
-    revoke_count = 0
-    def on_revoke(consumer, partitions):
-        nonlocal revoke_count
-        revoke_count += 1
+        def on_assign(self, consumer, partitions):
+            self.assign_count += 1
+            assert 1 == len(partitions)
 
-    lost_count = 0
-    def on_lost(consumer, partitions):
-        nonlocal lost_count
-        lost_count += 1
+        def on_revoke(self, consumer, partitions):
+            self.revoke_count += 1
+
+        def on_lost(self, consumer, partitions):
+            self.lost_count += 1
+
+    reb = RebalanceState()
 
     topic1 = kafka_cluster.create_topic("topic1")
     topic2 = kafka_cluster.create_topic("topic2")
@@ -59,26 +61,32 @@ def on_lost(consumer, partitions):
 
     kafka_cluster.seed_topic(topic1, value_source=[b'a'])
 
-    consumer.subscribe([topic1], on_assign=on_assign, on_revoke=on_revoke, on_lost=on_lost)
+    consumer.subscribe([topic1],
+                       on_assign=reb.on_assign,
+                       on_revoke=reb.on_revoke,
+                       on_lost=reb.on_lost)
     msg = consumer.poll(10)
-    assert msg != None
+    assert msg is not None
     assert msg.value() == b'a'
 
     # Subscribe to a second one partition topic, the second assign
     # call should be incremental (checked in the handler).
-    consumer.subscribe([topic1, topic2], on_assign=on_assign, on_revoke=on_revoke, on_lost=on_lost)
+    consumer.subscribe([topic1, topic2],
+                       on_assign=reb.on_assign,
+                       on_revoke=reb.on_revoke,
+                       on_lost=reb.on_lost)
 
     kafka_cluster.seed_topic(topic2, value_source=[b'b'])
     msg2 = consumer.poll(10)
-    assert msg2 != None
+    assert msg2 is not None
     assert msg2.value() == b'b'
 
-    assert 2 == assign_count
-    assert 0 == lost_count
-    assert 0 == revoke_count
+    assert 2 == reb.assign_count
+    assert 0 == reb.lost_count
+    assert 0 == reb.revoke_count
 
     msg3 = consumer.poll(1)
-    assert msg3 == None
+    assert msg3 is None
 
     # Exceed MaxPollIntervalMs => lost partitions.
     time.sleep(8)
@@ -90,11 +98,10 @@ def on_lost(consumer, partitions):
 
     # And poll again to trigger rebalance callbacks
     msg4 = consumer.poll(1)
-    assert msg4 == None
+    assert msg4 is None
 
-    assert 2 == assign_count
-    assert 1 == lost_count
-    assert 0 == revoke_count
+    assert 2 == reb.assign_count
+    assert 1 == reb.lost_count
+    assert 0 == reb.revoke_count
 
     consumer.close()
-
diff --git a/tests/integration/consumer/test_cooperative_rebalance_2.py b/tests/integration/consumer/test_cooperative_rebalance_2.py
@@ -35,31 +35,36 @@ def test_cooperative_rebalance_2(kafka_cluster):
                      'enable.auto.commit': 'false',
                      'auto.offset.reset': 'earliest',
                      'heartbeat.interval.ms': '2000',
-                     'session.timeout.ms': '6000', # minimum allowed by broker
+                     'session.timeout.ms': '6000',  # minimum allowed by broker
                      'max.poll.interval.ms': '6500'}
 
-    assign_count = 0
-    def on_assign(consumer, partitions):
-        nonlocal assign_count
-        assign_count += 1
+    class RebalanceState:
+        def __init__(self):
+            self.assign_count = 0
+            self.revoke_count = 0
 
-    revoke_count = 0
-    def on_revoke(consumer, partitions):
-        nonlocal revoke_count
-        revoke_count += 1
+        def on_assign(self, consumer, partitions):
+            self.assign_count += 1
+            assert 1 == len(partitions)
+
+        def on_revoke(self, consumer, partitions):
+            self.revoke_count += 1
+
+    reb = RebalanceState()
 
     topic1 = kafka_cluster.create_topic("topic1")
-    topic2 = kafka_cluster.create_topic("topic2")
 
     consumer = kafka_cluster.consumer(consumer_conf)
 
     kafka_cluster.seed_topic(topic1, value_source=[b'a'])
 
-    consumer.subscribe([topic1], on_assign=on_assign, on_revoke=on_revoke)
+    consumer.subscribe([topic1],
+                       on_assign=reb.on_assign,
+                       on_revoke=reb.on_revoke)
     msg = consumer.poll(10)
-    assert msg != None
+    assert msg is not None
     assert msg.value() == b'a'
-    assert assign_count == 1
+    assert reb.assign_count == 1
 
     # Exceed MaxPollIntervalMs => lost partitions.
     time.sleep(8)
@@ -71,8 +76,8 @@ def on_revoke(consumer, partitions):
 
     # The second call should trigger the revoked handler (because a lost
     # handler has not been specified).
-    assert 0 == revoke_count
+    assert 0 == reb.revoke_count
     consumer.poll(1)
-    assert 1 == revoke_count
+    assert 1 == reb.revoke_count
 
     consumer.close()
diff --git a/tests/integration/consumer/test_incremental_assign.py b/tests/integration/consumer/test_incremental_assign.py
@@ -40,7 +40,7 @@ def test_incremental_assign(kafka_cluster):
 
     consumer.incremental_assign([TopicPartition(topic1, 0, OFFSET_BEGINNING)])
     msg1 = consumer.poll(10)
-    assert msg1 != None
+    assert msg1 is not None
     assert 0 == msg1.offset()
     assert topic1 == msg1.topic()
     assert 0 == msg1.partition()
@@ -54,33 +54,33 @@ def test_incremental_assign(kafka_cluster):
 
     consumer.incremental_assign([TopicPartition(topic2, 0, OFFSET_BEGINNING)])
     msg2 = consumer.poll(10)
-    assert msg2 != None
+    assert msg2 is not None
     assert 0 == msg2.offset()
     assert topic2 == msg2.topic()
     assert 0 == msg2.partition()
-    
+
     consumer.incremental_unassign([TopicPartition(topic1, 0)])
     kafka_cluster.seed_topic(topic1, value_source=[b'aa'])
     msg3 = consumer.poll(2)
-    assert msg3 == None
+    assert msg3 is None
 
     kafka_cluster.seed_topic(topic2, value_source=[b'aaa'])
     msg4 = consumer.poll(10)
-    assert msg4 != None
+    assert msg4 is not None
     assert 1 == msg4.offset()
     assert topic2 == msg4.topic()
     assert 0 == msg4.partition()
     assert msg4.value() == b'aaa'
 
     consumer.incremental_assign([TopicPartition(topic1, 0)])
     msg5 = consumer.poll(10)
-    assert msg5 != None
+    assert msg5 is not None
     assert 1 == msg5.offset()
     assert topic1 == msg5.topic()
     assert 0 == msg5.partition()
 
     msg6 = consumer.poll(1)
-    assert msg6 == None
+    assert msg6 is None
 
     consumer.incremental_unassign([TopicPartition(topic1, 0)])
 
