Merge pull request #49 from bradmwilliams/python3-porting-changes

Changes for issues found porting over to Python3

Author: bradmwilliams

ansible/rebuild_module.digest

@@ -1 +1 @@
-d525f2e1e4a00799609cafff59726f38  -
+79380cf9ababbd7680f5a271720f8883  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -744,7 +744,7 @@ def build_secret_dockerconfigjson(secret_name, image_registry_auth_infos, obj_la
     the yaml to the server with create()). This method does not use/require oc to be resident
     on the python host.
     :param secret_name: The metadata.name to include
-    :paran image_registry_auth_infos: An iterable collection of ImageRegistryAuthInfo
+    :param image_registry_auth_infos: An iterable collection of ImageRegistryAuthInfo
     :param obj_labels: Additional labels to include in the resulting secret metadata.
     :return: A python dict of a secret resource.
     """
@@ -755,7 +755,7 @@ def build_secret_dockerconfigjson(secret_name, image_registry_auth_infos, obj_la
     auths = {}  # A map of registry urls to a map with a single element called 'auth'
 
     for ira in image_registry_auth_infos:
-        b64_username_password = base64.b64encode('{}:{}'.format(ira.username, ira.password))
+        b64_username_password = base64.b64encode('{}:{}'.format(ira.username, ira.password).encode()).decode()
         auths[ira.registry_url] = {
             'auth': b64_username_password
         }
@@ -769,7 +769,7 @@ def build_secret_dockerconfigjson(secret_name, image_registry_auth_infos, obj_la
     import json
 
     # Next, base64 encode the entire file.
-    b64_dockerconfigjson = base64.b64encode(json.dumps(dockerconfig, indent=4))
+    b64_dockerconfigjson = base64.b64encode(json.dumps(dockerconfig, indent=4).encode()).decode()
 
     # And stick it into the secret's data
     data = {

packages/openshift/base_verbs.py

@@ -25,12 +25,12 @@ def test_qname_matches(self):
     def test_set_operations(self):
         s1 = selector([])
         s2 = selector(['pod/abc', 'pod/xyz'])
-        self.assertEquals(s1.subtract(s2).qnames(), [])
-        self.assertEquals(s1.union(s2).qnames(), ['pod/abc', 'pod/xyz'])
+        self.assertEqual(s1.subtract(s2).qnames(), [])
+        self.assertEqual(s1.union(s2).qnames(), ['pod/abc', 'pod/xyz'])
 
         s3 = selector(['pod/abc2', 'pod/xyz'])
-        self.assertEquals(s2.subtract(s3).qnames(), ['pod/abc'])
-        self.assertEquals(s2.intersect(s3).qnames(), ['pod/xyz'])
+        self.assertEqual(s2.subtract(s3).qnames(), ['pod/abc'])
+        self.assertEqual(s2.intersect(s3).qnames(), ['pod/xyz'])
 
         # See whether fuzzy matching of kinds is working