Fix bug where bytes were passed to json.loads()

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

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)

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))

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)