Rename MessageStatus PersistenceStatus

rnpridgeon · rnpridgeon · commit ef27e70ac21f · 2019-01-25T22:44:54.000-05:00
diff --git a/confluent_kafka/__init__.py b/confluent_kafka/__init__.py
@@ -107,7 +107,7 @@ def _resolve_plugins(plugins):
     return paths_sep.join(resolved)
 
 
-class MessageStatus(Enum):
+class PersistenceStatus(Enum):
     """
         Returns the message's persistence status in the topic log.
 
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -361,7 +361,7 @@ static PyObject *Message_status (Message *self, PyObject *ignore) {
         PyObject *MessageStatus_Type, *message_status, *args;
 
         MessageStatus_Type = cfl_PyObject_lookup("confluent_kafka",
-                                                 "MessageStatus");
+                                                 "PersistenceStatus");
 
         if (!MessageStatus_Type) {
                 /* class not found */
diff --git a/tests/integration/integration_test.py b/tests/integration/integration_test.py
@@ -215,7 +215,7 @@ def verify_message_status():
                'not_persisted': 0}
 
     def handle_dr(_, msg):
-        if msg.status() is confluent_kafka.MessageStatus.STATUS_PERSISTED:
+        if msg.status() is confluent_kafka.PersistenceStatus.STATUS_PERSISTED:
             results['persisted'] += 1
             return
         results['not_persisted'] += 1
diff --git a/tests/test_Producer.py b/tests/test_Producer.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import pytest
 
-from confluent_kafka import Producer, KafkaError, KafkaException, libversion, MessageStatus
+from confluent_kafka import Producer, KafkaError, KafkaException, libversion, PersistenceStatus
 from struct import pack
 
 
@@ -201,7 +201,7 @@ def test_dr_msg_status():
 
     def handle_dr(_, msg):
         """ Message will timeout on the queue without actually being transmitted"""
-        assert msg.status() == MessageStatus.NOT_PERSISTED
+        assert msg.status() == PersistenceStatus.NOT_PERSISTED
 
     p.produce('mytopic', "This is the message payload", on_delivery=handle_dr)
 
diff --git a/tests/test_docs.py b/tests/test_docs.py
@@ -33,7 +33,7 @@ def build_doctree(tree, prefix, parent):
             # Skip Enum derived class
             continue
 
-        if n.startswith("MSG_"):
+        if n.startswith("MSG_STATUS"):
             continue
 
         full = prefix + n
diff --git a/tests/test_enums.py b/tests/test_enums.py
@@ -27,6 +27,6 @@ def test_offset_consts():
 
 def test_message_status():
     """ Make sure librdkafka's message statuses  are available. """
-    print(confluent_kafka.MessageStatus.NOT_PERSISTED)
-    print(confluent_kafka.MessageStatus.POSSIBLY_PERSISTED)
-    print(confluent_kafka.MessageStatus.STATUS_PERSISTED)
+    print(confluent_kafka.PersistenceStatus.NOT_PERSISTED)
+    print(confluent_kafka.PersistenceStatus.POSSIBLY_PERSISTED)
+    print(confluent_kafka.PersistenceStatus.STATUS_PERSISTED)
