Misc cleanup for docs and exception messages

rnpridgeon · Ryan P · commit 21ae36a6d0e8 · 2020-03-31T17:23:06.000-04:00
diff --git a/confluent_kafka/schema_registry/schema_registry_client.py b/confluent_kafka/schema_registry/schema_registry_client.py
@@ -114,7 +114,8 @@ def __init__(self, conf):
 
         # Any leftover keys are unknown to _RestClient
         if len(conf_copy) > 0:
-            raise ValueError("Unrecognized properties: {}".format(conf_copy.keys()))
+            raise ValueError("Unrecognized properties: {}"
+                             .format(", ".join(conf_copy.keys())))
 
     def _close(self):
         self.session.close()
diff --git a/tests/integration/serialization/test_serializers.py b/tests/integration/serialization/test_serializers.py
@@ -37,12 +37,12 @@ def test_numeric_serialization(kafka_cluster, serializer, deserializer, data):
 
     Args:
         kafka_cluster (KafkaClusterFixture): cluster fixture
+
         serializer (Serializer): serializer to test
+
         deserializer (Deserializer): deserializer to validate serializer
-        data(object(: input data
 
-    Raises:
-        AssertionError on test failure
+        data(object): input data
 
     """
     topic = kafka_cluster.create_topic("serialization-numeric")
@@ -71,11 +71,10 @@ def test_string_serialization(kafka_cluster, data, codec):
 
     Args:
         kafka_cluster (KafkaClusterFixture): cluster fixture
+
         data (unicode): input data
-        codec (str): encoding type
 
-    Raises:
-        AssertionError on test failure
+        codec (str): encoding type
 
     """
     topic = kafka_cluster.create_topic("serialization-string")
@@ -110,13 +109,14 @@ def test_mixed_serialization(kafka_cluster, key_serializer, value_serializer,
 
     Args:
         kafka_cluster (KafkaClusterFixture): cluster fixture
+
         key_serializer (Serializer): serializer to test
+
         key_deserializer (Deserializer): deserializer to validate serializer
+
         key (object): key data
-        value (object): value data
 
-    Raises:
-        AssertionError on test failure
+        value (object): value data
 
     """
     topic = kafka_cluster.create_topic("serialization-numeric")
diff --git a/tests/schema_registry/test_config.py b/tests/schema_registry/test_config.py
@@ -132,6 +132,5 @@ def test_config_unknown_prop():
             'invalid.conf': 1,
             'invalid.conf2': 2}
 
-    with pytest.raises(ValueError, match=r"Unrecognized properties:"
-                                         r" (\[(.*)\])$"):
+    with pytest.raises(ValueError, match=r"Unrecognized properties: (.*)"):
         SchemaRegistryClient(conf)
