Py3: do not use iter* methods with dict

yarda7 · Jul 2, 2016 · 3bf36f7 · 3bf36f7
1 parent bfd6175
commit 3bf36f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dns/zone.py b/dns/zone.py
@@ -34,6 +34,9 @@
 from ._compat import string_types, text_type
 
 
+_py3 = sys.version_info > (3,)
+
+
 class BadZone(dns.exception.DNSException):
 
     """The DNS zone is malformed."""
@@ -150,16 +153,22 @@ def __delitem__(self, key):
         del self.nodes[key]
 
     def __iter__(self):
-        return self.nodes.iterkeys()
+        return self.nodes.__iter__()
 
     def iterkeys(self):
-        return self.nodes.iterkeys()
+        if _py3:
+            return self.nodes.keys()
+        else:
+            return self.nodes.iterkeys()  # pylint: disable=dict-iter-method
 
     def keys(self):
         return self.nodes.keys()
 
     def itervalues(self):
-        return self.nodes.itervalues()
+        if _py3:
+            return self.nodes.values()
+        else:
+            return self.nodes.itervalues()  # pylint: disable=dict-iter-method
 
     def values(self):
         return self.nodes.values()

diff --git a/pylintrc b/pylintrc
@@ -22,7 +22,6 @@ disable=
     bad-continuation,
     bare-except,
     deprecated-method,
-    dict-iter-method,
     fixme,
     getslice-method,
     global-statement,