Description: Changes for new python3
Author: Colin Turner <ct@piglets.org>
Bug-Debian: https://bugs.debian.org/1076428

--- a/pyzor/client.py
+++ b/pyzor/client.py
@@ -78,7 +78,7 @@
         if accounts is None:
             accounts = {}
         self.accounts = dict(((host, int(port)), account)
-                             for (host, port), account in accounts.iteritems())
+                             for (host, port), account in accounts.items())
         if spec is None:
             spec = pyzor.digest.digest_spec
         self.spec = spec
@@ -227,12 +227,12 @@
 
     def force(self):
         """Force send any remaining reports."""
-        for address, msg in self.r_requests.iteritems():
+        for address, msg in self.r_requests.items():
             try:
                 self.send(msg, address)
             except:
                 continue
-        for address, msg in self.w_requests.iteritems():
+        for address, msg in self.w_requests.items():
             try:
                 self.send(msg, address)
             except:
--- a/pyzor/digest.py
+++ b/pyzor/digest.py
@@ -105,7 +105,7 @@
     def handle_pieced(self, lines, spec):
         """Digest stuff according to the spec."""
         for offset, length in spec:
-            for i in xrange(length):
+            for i in range(length):
                 try:
                     line = lines[int(offset * len(lines) // 100) + i]
                 except IndexError:
--- a/scripts/pyzor
+++ b/scripts/pyzor
@@ -110,7 +110,7 @@
     config = ConfigParser.ConfigParser()
     # Set the defaults.
     config.add_section("client")
-    for key, value in defaults.iteritems():
+    for key, value in defaults.items():
         config.set("client", key, value)
     # Override with the configuration.
     config.read(os.path.join(options.homedir, "config"))
