Minor modifications following Ewen's code review

edenhill · edenhill · commit e6d38775b0ac · 2016-05-09T20:00:54.000+02:00
diff --git a/confluent_kafka/kafkatest/README b/confluent_kafka/kafkatest/README
@@ -1,4 +1 @@
-This directory contains clients implementing the official Kafka tests/kafkatest
-Verifiable client test semantics.
-
 FIXME: Instructions on how to use this.
diff --git a/confluent_kafka/kafkatest/__init__.py b/confluent_kafka/kafkatest/__init__.py
@@ -0,0 +1 @@
+""" This directory contains clients implementing the official Kafka tests/kafkatest."""
diff --git a/confluent_kafka/kafkatest/kafkatest_verifiable_consumer.py b/confluent_kafka/kafkatest/kafkatest_verifiable_consumer.py
@@ -19,7 +19,7 @@
 from confluent_kafka import Consumer, KafkaError, KafkaException
 from verifiable_client import VerifiableClient
 
-class VerifiableConsumer (VerifiableClient):
+class VerifiableConsumer(VerifiableClient):
     """
     confluent-kafka-python backed VerifiableConsumer class for use with
     Kafka's kafkatests client tests.
@@ -202,7 +202,7 @@ def msg_consume (self, msg):
         self.do_commit(immediate=False)
 
 
-class AssignedPartition (object):
+class AssignedPartition(object):
     """ Local state container for assigned partition. """
     def __init__ (self, topic, partition):
         super(AssignedPartition, self).__init__()
diff --git a/confluent_kafka/kafkatest/kafkatest_verifiable_producer.py b/confluent_kafka/kafkatest/kafkatest_verifiable_producer.py
@@ -19,7 +19,7 @@
 from confluent_kafka import Producer, KafkaError, KafkaException
 from verifiable_client import VerifiableClient
 
-class VerifiableProducer (VerifiableClient):
+class VerifiableProducer(VerifiableClient):
     """
     confluent-kafka-python backed VerifiableProducer class for use with
     Kafka's kafkatests client tests.
diff --git a/confluent_kafka/kafkatest/verifiable_client.py b/confluent_kafka/kafkatest/verifiable_client.py
@@ -16,7 +16,7 @@
 import signal, socket, os, sys, time, json, re, datetime
 
 
-class VerifiableClient (object):
+class VerifiableClient(object):
     """
     Generic base class for a kafkatest verifiable client.
     Implements the common kafkatest protocol and semantics.
@@ -61,20 +61,20 @@ def send (self, d):
     @staticmethod
     def set_config (conf, args):
         """ Set client config properties using args dict. """
-        for n in args:
-            if args[n] is None:
+        for n,v in args.iteritems():
+            if v is None:
                 continue
             # Things to ignore
             if '.' not in n:
                 # App config, skip
                 continue
-            if n[:6] == 'topic.':
+            if n.startswith('topic.'):
                 # Set "topic.<...>" properties on default topic conf dict
-                conf['default.topic.config'][n[6:]] = args[n]
+                conf['default.topic.config'][n[6:]] = v
             elif n == 'partition.assignment.strategy':
                 # Convert Java class name to config value.
                 # "org.apache.kafka.clients.consumer.RangeAssignor" -> "range"
                 conf[n] = re.sub(r'org.apache.kafka.clients.consumer.(\w+)Assignor',
-                                 lambda x: x.group(1).lower(), args[n])
+                                 lambda x: x.group(1).lower(), v)
             else:
-                conf[n] = args[n]
+                conf[n] = v

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+""" This directory contains clients implementing the official Kafka tests/kafkatest."""`