Fix: check for right subscription_identifier;

wialon · Apr 30, 2020 · 99479be · 99479be
1 parent 18e3e21
commit 99479be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/gmqtt/client.py b/gmqtt/client.py
@@ -249,6 +249,10 @@ def update_subscriptions_with_subscription_or_topic(
 
             subscriptions = subscription_or_topic
         elif isinstance(subscription_or_topic, str):
+
+            if subscription_identifier is sentinel:
+                subscription_identifier = None
+
             subscriptions = [Subscription(subscription_or_topic, qos=qos, no_local=no_local,
                                           retain_as_published=retain_as_published,
                                           retain_handling_options=retain_handling_options,

diff --git a/gmqtt/mqtt/package.py b/gmqtt/mqtt/package.py
@@ -161,6 +161,9 @@ def build_package(cls, subscriptions, protocol, **kwargs) -> Tuple[int, bytes]:
         if subscription_identifier is not cls.sentinel:
             kwargs['subscription_identifier'] = subscription_identifier
 
+        if subscription_identifier is None:
+            kwargs.pop('subscription_identifier', None)
+
         properties = cls._build_properties_data(kwargs, protocol.proto_ver)
         remaining_length += len(properties)