Skip to content

Commit 81eb950

Browse files
author
Naor Livne
committed
upgrading to python 3.7
1 parent 3533925 commit 81eb950

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: python
2+
dist: xenial
23
python:
3-
- '2.7'
4+
- '3.7'
45
services:
56
- docker
67
install:

NebulaPythonSDK/sdk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, username=None, password=None, host="127.0.0.1", port=80, prot
2626
if six.PY3 is True:
2727
user_pass_combo = user_pass_combo.encode('utf-8')
2828
self.basic_auth = base64.b64encode(user_pass_combo)
29-
self.headers["authorization"] = "Basic " + self.basic_auth
29+
self.headers["authorization"] = "Basic " + self.basic_auth.decode('utf-8')
3030
self.API_VERSION = "v2"
3131

3232
# create a new nebula app, requires the app name to create and a complete dict of the config values for it

test/test_nebula_python_sdk.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def test_list_apps(self):
134134
self.assertEqual(reply["status_code"], 200)
135135
self.assertTrue(isinstance(app_list, list))
136136
for app in app_list:
137-
self.assertTrue(isinstance(app, unicode))
137+
self.assertTrue(isinstance(app, str))
138138

139139
def test_prune_images(self):
140140
nebula_connection_object = nebula_connection()
@@ -176,9 +176,9 @@ def test_device_group_flow(self, device_group="unit_test_device_group", app="uni
176176
for app_reply in reply["reply"]["apps"]:
177177
self.assertTrue(isinstance(app_reply["app_id"], int))
178178
self.assertTrue(isinstance(app_reply["containers_per"], dict))
179-
self.assertTrue(isinstance(app_reply["app_name"], unicode))
179+
self.assertTrue(isinstance(app_reply["app_name"], str))
180180
self.assertTrue(isinstance(app_reply["devices"], list))
181-
self.assertTrue(isinstance(app_reply["docker_image"], unicode))
181+
self.assertTrue(isinstance(app_reply["docker_image"], str))
182182
self.assertTrue(isinstance(app_reply["env_vars"], dict))
183183
self.assertTrue(isinstance(app_reply["networks"], list))
184184
self.assertTrue(isinstance(app_reply["privileged"], bool))

0 commit comments

Comments
 (0)