Merge pull request #43 from yashgiri/master

Porting via modernize -- verify works

Author: jupierce

ansible/rebuild_module.digest

@@ -1 +1 @@
-47d4a849eeec07d67f5c4d3927f75121  -
+d2a3d6de4ff5eddbaeecfea6d04d42a8  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -2,6 +2,7 @@
 
 from __future__ import print_function
 
+from __future__ import absolute_import
 from ansible.module_utils.basic import AnsibleModule
 
 import os

ansible/roles/openshift_client_python/library/openshift_client_python.template.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 from __future__ import print_function
+from __future__ import absolute_import
 import argparse
 import time
 import logging

examples/cluster_tests.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 from __future__ import print_function
+from __future__ import absolute_import
 from openshift import *
 
 try:

examples/coverage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import absolute_import
 import openshift as oc
 
 if __name__ == '__main__':

examples/dump.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import absolute_import
 import openshift as oc
 
 if __name__ == '__main__':

examples/report.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 from __future__ import print_function
+from __future__ import absolute_import
 import openshift as oc
 
 if __name__ == '__main__':

examples/simple.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+import six
+from six.moves import range
 
 
 class OpenShiftPythonException(Exception):
@@ -116,16 +119,16 @@ def _element_can_match( master, test, case_insensitive=False):
         return master is test
 
     if isinstance(master, str):
-        master = unicode(master)  # Turn str into unicode
+        master = six.text_type(master)  # Turn str into unicode
         if case_insensitive:
             master = master.lower()
 
     if isinstance(test, str):
-        test = unicode(test)  # Turn str into unicode
+        test = six.text_type(test)  # Turn str into unicode
         if case_insensitive:
             test = test.lower()
 
-    for prim in [bool, int, unicode, float]:
+    for prim in [bool, int, six.text_type, float]:
         if isinstance(master, prim):
             return master == test or str(master) == str(test)
 
@@ -240,7 +243,7 @@ def __init__(self, dict_to_model=None, case_insensitive=False):
 
     def __getattr__(self, attr):
 
-        if isinstance(attr, basestring):
+        if isinstance(attr, six.string_types):
             if attr.startswith('_Model__'):  # e.g. _Model__case_insensitive
                 raise AttributeError
 
@@ -283,7 +286,7 @@ def _primitive(self):
         :rtype: dict
         """
         d = {}
-        for k, v in self.iteritems():
+        for k, v in six.iteritems(self):
             if isinstance(v, Model) or isinstance(v, ListModel):
                 v = v._primitive()
             d[k] = v

lambda/model/python/model.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 from __future__ import print_function
+from __future__ import absolute_import
 import openshift as oc
 from openshift import Missing
 import traceback