Adding a few updates for python27,35 compatibility

roles/lib_openshift/library/oc_edit.py

@@ -947,14 +947,14 @@ class OpenShiftCLI(object):
                     try:
                         rval['results'] = json.loads(stdout)
                     except ValueError as err:
-                        if "No JSON object could be decoded" in str(err):
-                            err = str(err)
+                        if "No JSON object could be decoded" in err.args:
+                            err = err.args
                 elif output_type == 'raw':
                     rval['results'] = stdout
 
             if self.verbose:
-                print(stdout)
-                print(stderr)
+                print("STDOUT: {0}".format(stdout))
+                print("STDERR: {0}".format(stderr))
 
             if err:
                 rval.update({"err": err,

roles/lib_openshift/library/oc_route.py

@@ -951,14 +951,14 @@ class OpenShiftCLI(object):
                     try:
                         rval['results'] = json.loads(stdout)
                     except ValueError as err:
-                        if "No JSON object could be decoded" in str(err):
-                            err = str(err)
+                        if "No JSON object could be decoded" in err.args:
+                            err = err.args
                 elif output_type == 'raw':
                     rval['results'] = stdout
 
             if self.verbose:
-                print(stdout)
-                print(stderr)
+                print("STDOUT: {0}".format(stdout))
+                print("STDERR: {0}".format(stderr))
 
             if err:
                 rval.update({"err": err,

roles/lib_openshift/src/lib/base.py

@@ -230,14 +230,14 @@ class OpenShiftCLI(object):
                     try:
                         rval['results'] = json.loads(stdout)
                     except ValueError as err:
-                        if "No JSON object could be decoded" in str(err):
-                            err = str(err)
+                        if "No JSON object could be decoded" in err.args:
+                            err = err.args
                 elif output_type == 'raw':
                     rval['results'] = stdout
 
             if self.verbose:
-                print(stdout)
-                print(stderr)
+                print("STDOUT: {0}".format(stdout))
+                print("STDERR: {0}".format(stderr))
 
             if err:
                 rval.update({"err": err,

roles/lib_utils/src/doc/yedit

@@ -102,6 +102,12 @@ options:
     required: false
     default: true
     aliases: []
+  separator:
+    description:
+    - The separator being used when parsing strings.
+    required: false
+    default: '.'
+    aliases: []
 author:
 - "Kenny Woodson <kwoodson@redhat.com>"
 extends_documentation_fragment: []