Fixes b64 types for encoding / JSON decoding (GoogleCloudPlatform#1259)

gguuss · Jon Wayne Parrott · commit 92ffb562979e · 2017-12-08T10:00:04.000-08:00
diff --git a/iot/api-client/end_to_end_example/cloudiot_pubsub_example_server.py b/iot/api-client/end_to_end_example/cloudiot_pubsub_example_server.py
@@ -110,7 +110,8 @@ def _update_device_config(self, project_id, region, registry_id, device_id,
                 # The data is passed as raw bytes, so you encode it as base64.
                 # Note that the device will receive the decoded string, so you
                 # do not need to base64 decode the string on the device.
-                'binary_data': base64.b64encode(config_data_json)
+                'binary_data': base64.b64encode(
+                        config_data_json.encode('utf-8')).decode('ascii')
             }
         }
 
diff --git a/iot/api-client/end_to_end_example/cloudiot_pubsub_example_server_test.py b/iot/api-client/end_to_end_example/cloudiot_pubsub_example_server_test.py
@@ -30,7 +30,7 @@
 
 def test_config_turn_on(capsys):
     max_temp = 11
-    data = {"temperature": max_temp}
+    data = {'temperature': max_temp}
 
     Server = example_server.Server(service_account_json)
     Server._update_device_config(
@@ -42,11 +42,13 @@ def test_config_turn_on(capsys):
 
     stdout, _ = capsys.readouterr()
     assert 'on' in stdout
+    assert '11' in stdout
+    assert 'test-device-{}' in stdout
 
 
 def test_config_turn_off(capsys):
     min_temp = -1
-    data = {"temperature": min_temp}
+    data = {'temperature': min_temp}
 
     Server = example_server.Server(service_account_json)
     Server._update_device_config(

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ def _update_device_config(self, project_id, region, registry_id, device_id,`
`110`	`110`	`# The data is passed as raw bytes, so you encode it as base64.`
`111`	`111`	`# Note that the device will receive the decoded string, so you`
`112`	`112`	`# do not need to base64 decode the string on the device.`
`113`		`- 'binary_data': base64.b64encode(config_data_json)`
	`113`	`+ 'binary_data': base64.b64encode(`
	`114`	`+ config_data_json.encode('utf-8')).decode('ascii')`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`