From 92f30679793ca85c545481e2362858ed73aa357f Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Tue, 4 Apr 2017 16:00:17 -0400 Subject: Fixed a string format and a lint space issue --- roles/lib_openshift/library/oc_obj.py | 4 ++-- roles/lib_openshift/src/ansible/oc_obj.py | 2 +- roles/lib_openshift/src/class/oc_obj.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/lib_openshift') diff --git a/roles/lib_openshift/library/oc_obj.py b/roles/lib_openshift/library/oc_obj.py index 5a90f1805..0b01670c6 100644 --- a/roles/lib_openshift/library/oc_obj.py +++ b/roles/lib_openshift/library/oc_obj.py @@ -1450,7 +1450,7 @@ class OCObject(OpenShiftCLI): '''return a kind by name ''' results = self._get(self.kind, name=self.name, selector=self.selector) if (results['returncode'] != 0 and 'stderr' in results and - '\"%s\" not found' % self.name in results['stderr']): + '\"{}\" not found'.format(self.name) in results['stderr']): results['returncode'] = 0 return results @@ -1647,7 +1647,7 @@ def main(): force=dict(default=False, type='bool'), selector=dict(default=None, type='str'), ), - mutually_exclusive=[["content", "files"],["selector", "name"]], + mutually_exclusive=[["content", "files"], ["selector", "name"]], supports_check_mode=True, ) diff --git a/roles/lib_openshift/src/ansible/oc_obj.py b/roles/lib_openshift/src/ansible/oc_obj.py index 4ace53c1e..6ab53d044 100644 --- a/roles/lib_openshift/src/ansible/oc_obj.py +++ b/roles/lib_openshift/src/ansible/oc_obj.py @@ -23,7 +23,7 @@ def main(): force=dict(default=False, type='bool'), selector=dict(default=None, type='str'), ), - mutually_exclusive=[["content", "files"],["selector", "name"]], + mutually_exclusive=[["content", "files"], ["selector", "name"]], supports_check_mode=True, ) diff --git a/roles/lib_openshift/src/class/oc_obj.py b/roles/lib_openshift/src/class/oc_obj.py index 4d03fc80e..667b98eac 100644 --- a/roles/lib_openshift/src/class/oc_obj.py +++ b/roles/lib_openshift/src/class/oc_obj.py @@ -26,7 +26,7 @@ class OCObject(OpenShiftCLI): '''return a kind by name ''' results = self._get(self.kind, name=self.name, selector=self.selector) if (results['returncode'] != 0 and 'stderr' in results and - '\"%s\" not found' % self.name in results['stderr']): + '\"{}\" not found'.format(self.name) in results['stderr']): results['returncode'] = 0 return results -- cgit v1.2.1