summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/library/oc_scale.py
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-16 17:14:53 -0400
committerGitHub <noreply@github.com>2017-03-16 17:14:53 -0400
commit866e5bf8581b8468414b7b192537b616d78a42a3 (patch)
tree78b5c089052ada4cb7e0d8b89d9c8cd1d8af8c41 /roles/lib_openshift/library/oc_scale.py
parentd7f70501e32e0fbaec5396c9435c6f78a331b180 (diff)
parentb1b2ba969db769263eae85b6c69f4cd9197f155c (diff)
downloadopenshift-866e5bf8581b8468414b7b192537b616d78a42a3.tar.gz
openshift-866e5bf8581b8468414b7b192537b616d78a42a3.tar.bz2
openshift-866e5bf8581b8468414b7b192537b616d78a42a3.tar.xz
openshift-866e5bf8581b8468414b7b192537b616d78a42a3.zip
Merge pull request #3683 from kwoodson/py35_scope_fix
Fixing variable naming for 35 scoping.
Diffstat (limited to 'roles/lib_openshift/library/oc_scale.py')
-rw-r--r--roles/lib_openshift/library/oc_scale.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/lib_openshift/library/oc_scale.py b/roles/lib_openshift/library/oc_scale.py
index 56e4e38f7..98f1d94a7 100644
--- a/roles/lib_openshift/library/oc_scale.py
+++ b/roles/lib_openshift/library/oc_scale.py
@@ -1032,9 +1032,9 @@ class OpenShiftCLI(object):
if output_type == 'json':
try:
rval['results'] = json.loads(stdout)
- except ValueError as err:
- if "No JSON object could be decoded" in err.args:
- err = err.args
+ except ValueError as verr:
+ if "No JSON object could be decoded" in verr.args:
+ err = verr.args
elif output_type == 'raw':
rval['results'] = stdout