python 3 iteration fixes

diff --git a/dns/zone.py b/dns/zone.py
index 5479f5aa5752ad9ec9731117ee22c0bfe40ad229..b4aa1b513fa6bf691bd4d30fad17a617a4f23706 100644 (file)
--- a/dns/zone.py
+++ b/dns/zone.py
@@ -131,23 +131,14 @@ class Zone(object):
         del self.nodes[key]
 
     def __iter__(self):
-        return self.nodes.iterkeys()
-
-    def iterkeys(self):
-        return self.nodes.iterkeys()
+        return iter(self.nodes.keys())
 
     def keys(self):
         return self.nodes.keys()
 
-    def itervalues(self):
-        return self.nodes.itervalues()
-
     def values(self):
         return self.nodes.values()
 
-    def iteritems(self):
-        return self.nodes.iteritems()
-
     def items(self):
         return self.nodes.items()
 
@@ -482,10 +473,9 @@ class Zone(object):
             want_close = False
         try:
             if sorted:
-                names = list(self.keys())
-                names.sort()
+                names = sorted(self.keys())
             else:
-                names = self.iterkeys()
+                names = self.keys()
             for n in names:
                 l = self[n].to_text(n, origin=self.origin,
                                     relativize=relativize)

diff --git a/examples/xfr.py b/examples/xfr.py
index 24e1c45e54bf16330664d7845a919d252ebd4aae..669c6d137c2ddbc21fed6432dd45ff3fc18ffb55 100755 (executable)
--- a/examples/xfr.py
+++ b/examples/xfr.py
@@ -3,8 +3,7 @@
 import dns.query
 import dns.zone
 
-z = dns.zone.from_xfr(dns.query.xfr('204.152.189.147', 'dnspython.org'))
-names = z.nodes.keys()
-names.sort()
+z = dns.zone.from_xfr(dns.query.xfr('78.32.75.15', 'dnspython.org'))
+names = sorted(z)
 for n in names:
         print(z[n].to_text(n))