fix merge problem

sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py

@@ -24,7 +24,6 @@
     _X_OPT_ENQUEUED_TIME,
     _X_OPT_SEQUENCE_NUMBER,
     _X_OPT_ENQUEUE_SEQUENCE_NUMBER,
-    _X_OPT_PARTITION_ID,
     _X_OPT_PARTITION_KEY,
     _X_OPT_VIA_PARTITION_KEY,
     _X_OPT_LOCKED_UNTIL,
@@ -775,35 +774,6 @@ def _settle_via_receiver_link(self, settle_operation, dead_letter_reason=None, d
             return functools.partial(self.message.modify, True, True)
         raise ValueError("Unsupported settle operation type: {}".format(settle_operation))
 
-
-class ReceivedMessage(ReceivedMessageBase):
-    def _settle_message(
-            self,
-            settle_operation,
-            dead_letter_reason=None,
-            dead_letter_description=None,
-    ):
-        # type: (str, Optional[str], Optional[str]) -> None
-        try:
-            if not self._is_deferred_message:
-                try:
-                    self._settle_via_receiver_link(settle_operation,
-                                                   dead_letter_reason=dead_letter_reason,
-                                                   dead_letter_description=dead_letter_description)()
-                    return
-                except RuntimeError as exception:
-                    _LOGGER.info(
-                        "Message settling: %r has encountered an exception (%r)."
-                        "Trying to settle through management link",
-                        settle_operation,
-                        exception
-                    )
-            self._settle_via_mgmt_link(settle_operation,
-                                       dead_letter_reason=dead_letter_reason,
-                                       dead_letter_description=dead_letter_description)()
-        except Exception as e:
-            raise MessageSettleFailed(settle_operation, e)
-
     @property
     def _lock_expired(self):
         # type: () -> bool
@@ -863,6 +833,35 @@ def locked_until_utc(self):
             self._expiry = utc_from_timestamp(expiry_in_seconds)
         return self._expiry
 
+
+class ReceivedMessage(ReceivedMessageBase):
+    def _settle_message(
+            self,
+            settle_operation,
+            dead_letter_reason=None,
+            dead_letter_description=None,
+    ):
+        # type: (str, Optional[str], Optional[str]) -> None
+        try:
+            if not self._is_deferred_message:
+                try:
+                    self._settle_via_receiver_link(settle_operation,
+                                                   dead_letter_reason=dead_letter_reason,
+                                                   dead_letter_description=dead_letter_description)()
+                    return
+                except RuntimeError as exception:
+                    _LOGGER.info(
+                        "Message settling: %r has encountered an exception (%r)."
+                        "Trying to settle through management link",
+                        settle_operation,
+                        exception
+                    )
+            self._settle_via_mgmt_link(settle_operation,
+                                       dead_letter_reason=dead_letter_reason,
+                                       dead_letter_description=dead_letter_description)()
+        except Exception as e:
+            raise MessageSettleFailed(settle_operation, e)
+
     def complete(self):
         # type: () -> None
         """Complete the message.

sdk/servicebus/azure-servicebus/samples/async_samples/session_pool_receive_async.py

@@ -30,7 +30,6 @@ async def message_processing(servicebus_client, queue_name):
                     print("Time to live: {}".format(message.time_to_live))
                     print("Sequence number: {}".format(message.sequence_number))
                     print("Enqueue Sequence number: {}".format(message.enqueued_sequence_number))
-                    print("Partition ID: {}".format(message.partition_id))
                     print("Partition Key: {}".format(message.partition_key))
                     print("Locked until: {}".format(message.locked_until_utc))
                     print("Lock Token: {}".format(message.lock_token))

sdk/servicebus/azure-servicebus/samples/sync_samples/sample_code_servicebus.py

@@ -243,7 +243,6 @@ def example_send_and_receive_sync():
             print("Time to live: {}".format(message.time_to_live))
             print("Sequence number: {}".format(message.sequence_number))
             print("Enqueued Sequence numger: {}".format(message.enqueued_sequence_number))
-            print("Partition ID: {}".format(message.partition_id))
             print("Partition Key: {}".format(message.partition_key))
             print("Properties: {}".format(message.properties))
             print("Delivery count: {}".format(message.delivery_count))

sdk/servicebus/azure-servicebus/samples/sync_samples/session_pool_receive.py

@@ -29,7 +29,6 @@ def message_processing(sb_client, queue_name, messages):
                     print("Time to live: {}".format(message.time_to_live))
                     print("Sequence number: {}".format(message.sequence_number))
                     print("Enqueue Sequence number: {}".format(message.enqueued_sequence_number))
-                    print("Partition ID: {}".format(message.partition_id))
                     print("Partition Key: {}".format(message.partition_key))
                     print("Locked until: {}".format(message.locked_until_utc))
                     print("Lock Token: {}".format(message.lock_token))

sdk/servicebus/azure-servicebus/tests/utilities.py

@@ -29,7 +29,6 @@ def print_message(_logger, message):
     _logger.debug("Time to live: {}".format(message.time_to_live))
     _logger.debug("Sequence number: {}".format(message.sequence_number))
     _logger.debug("Enqueue Sequence numger: {}".format(message.enqueued_sequence_number))
-    _logger.debug("Partition ID: {}".format(message.partition_id))
     _logger.debug("Partition Key: {}".format(message.partition_key))
     _logger.debug("Properties: {}".format(message.properties))
     _logger.debug("Delivery count: {}".format(message.delivery_count))