summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-12-14 14:40:57 -0800
committerToshio Kuratomi <a.badger@gmail.com>2016-12-14 14:41:31 -0800
commit62dbe0debb7c115206cf06f50e540237a63c0b9a (patch)
treed8cacb5601444029ae77f9f72d4aa2de2484c8e9
parent59a334c621abc2fbb82710e4d0f483b1816e4353 (diff)
downloadansible-modules-core-62dbe0debb7c115206cf06f50e540237a63c0b9a.tar.gz
Change the keydict object in authorized_keys so it doesn't throw a false positive
keydict is a bad data structure anyway. We don't use the iteritems and itervalues methods so just disable them so that the code-smell tests do not trigger on it. (cherry picked from 0b440a928908b6b8c973a16f6fc7b26f893cce04)
-rw-r--r--system/authorized_key.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/authorized_key.py b/system/authorized_key.py
index fb82579b..4d4ef487 100644
--- a/system/authorized_key.py
+++ b/system/authorized_key.py
@@ -207,16 +207,16 @@ class keydict(dict):
yield key, self[key][indexes[key]]
def iteritems(self):
- return self._item_generator()
+ raise NotImplementedError("Do not use this as it's not available on py3")
def items(self):
- return list(self.iteritems())
+ return list(self._item_generator())
def itervalues(self):
- return (item[1] for item in self.iteritems())
+ raise NotImplementedError("Do not use this as it's not available on py3")
def values(self):
- return list(self.itervalues())
+ return [item[1] for item in self.items()]
def keyfile(module, user, write=False, path=None, manage_dir=True):