diff --git a/awsiot/__init__.py b/awsiot/__init__.py index fff28991..b6e40737 100644 --- a/awsiot/__init__.py +++ b/awsiot/__init__.py @@ -139,9 +139,9 @@ def on_suback(suback_future): else: future.set_result(None) - def callback_wrapper(topic, payload_str): + def callback_wrapper(topic, payload_bytes): try: - payload_obj = json.loads(payload_str) + payload_obj = json.loads(payload_bytes.decode()) event = payload_to_class_fn(payload_obj) except: # can't deliver payload, invoke callback with None diff --git a/samples/jobs.py b/samples/jobs.py index 0bcc573d..41870aca 100644 --- a/samples/jobs.py +++ b/samples/jobs.py @@ -235,7 +235,7 @@ def on_update_job_execution_rejected(rejected): mqtt_client = mqtt.Client(client_bootstrap, tls_context) - port = 443 if io.is_alpn_available() else 8883 + port = 8883 print("Connecting to {} on port {}...".format(args.endpoint, port)) mqtt_connection = mqtt.Connection( client=mqtt_client) diff --git a/samples/pubsub.py b/samples/pubsub.py index 87b6fe70..ccda702a 100644 --- a/samples/pubsub.py +++ b/samples/pubsub.py @@ -73,7 +73,7 @@ def on_message_received(topic, message): mqtt_client = mqtt.Client(client_bootstrap, tls_context) # Create connection - port = 443 if io.is_alpn_available() else 8883 + port = 8883 print("Connecting to {} on port {} with client ID '{}'...".format( args.endpoint, port, args.client_id)) diff --git a/samples/shadow.py b/samples/shadow.py index 0cab041c..b6a83218 100644 --- a/samples/shadow.py +++ b/samples/shadow.py @@ -240,7 +240,7 @@ def user_input_thread_fn(): mqtt_client = mqtt.Client(client_bootstrap, tls_context) - port = 443 if io.is_alpn_available() else 8883 + port = 8883 print("Connecting to {} on port {}...".format(args.endpoint, port)) mqtt_connection = mqtt.Connection( client=mqtt_client)