Py3: do not use iter* methods with dict

diff --git a/dns/zone.py b/dns/zone.py
index ce2bc1bc3417902d2be5a5e978721a54d13fc4ef..4a73e1e419312d34dfc2dbc2f0eb3b5c4a4cadb9 100644 (file)
--- a/dns/zone.py
+++ b/dns/zone.py
@@ -34,6 +34,9 @@ import dns.grange
 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 @@ class Zone(object):
         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
index 60344173816cab324e7a15dad2ae231a5a43d8fa..74e21961a1eb7019cee5c9367f2dc80a66a24e71 100644 (file)
--- a/pylintrc
+++ b/pylintrc
@@ -22,7 +22,6 @@ disable=
     bad-continuation,
     bare-except,
     deprecated-method,
-    dict-iter-method,
     fixme,
     getslice-method,
     global-statement,