소스 검색

Merge pull request #3424 from ashcrow/new-modules-py3

Replace has_key in new modules
Jason DeTiberus 8 년 전
부모
커밋
a40ee317e7
3개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      roles/lib_openshift/library/oc_secret.py
  2. 1 1
      roles/lib_openshift/src/class/oc_secret.py
  3. 1 1
      roles/lib_openshift/src/lib/secret.py

+ 2 - 2
roles/lib_openshift/library/oc_secret.py

@@ -1429,7 +1429,7 @@ class Secret(Yedit):
     def update_secret(self, key, value):
         ''' update a secret'''
         # pylint: disable=no-member
-        if self.secrets.has_key(key):
+        if key in self.secrets:
             self.secrets[key] = value
         else:
             self.add_secret(key, value)
@@ -1467,7 +1467,7 @@ class OCSecret(OpenShiftCLI):
         if results['returncode'] == 0 and results['results'][0]:
             results['exists'] = True
             if self.decode:
-                if results['results'][0].has_key('data'):
+                if 'data' in results['results'][0]:
                     for sname, value in results['results'][0]['data'].items():
                         results['decoded'][sname] = base64.b64decode(value)
 

+ 1 - 1
roles/lib_openshift/src/class/oc_secret.py

@@ -29,7 +29,7 @@ class OCSecret(OpenShiftCLI):
         if results['returncode'] == 0 and results['results'][0]:
             results['exists'] = True
             if self.decode:
-                if results['results'][0].has_key('data'):
+                if 'data' in results['results'][0]:
                     for sname, value in results['results'][0]['data'].items():
                         results['decoded'][sname] = base64.b64decode(value)
 

+ 1 - 1
roles/lib_openshift/src/lib/secret.py

@@ -91,7 +91,7 @@ class Secret(Yedit):
     def update_secret(self, key, value):
         ''' update a secret'''
         # pylint: disable=no-member
-        if self.secrets.has_key(key):
+        if key in self.secrets:
             self.secrets[key] = value
         else:
             self.add_secret(key, value)