2to3 changes run from 3.4.1

moaxey · moaxey · commit 4471cac654a7 · 2014-08-26T21:59:16.000+10:00
diff --git a/examples/browser.py b/examples/browser.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, division, print_function, unicode_literals
+
 
 """ Example of browsing for a service (in this case, HTTP) """
 
@@ -27,7 +27,7 @@ def addService(self, zeroconf, type, name):
             prop = info.getProperties()
             if prop:
                 print("  Properties are")
-                for key, value in prop.items():
+                for key, value in list(prop.items()):
                     print("    %s: %s" % (key, value))
         else:
             print("  No info")
@@ -39,6 +39,6 @@ def addService(self, zeroconf, type, name):
     listener = MyListener()
     browser = ServiceBrowser(zeroconf, "_http._tcp.local.", listener)
     try:
-        raw_input("Waiting (press Enter to exit)...\n\n")
+        input("Waiting (press Enter to exit)...\n\n")
     finally:
         zeroconf.close()
diff --git a/examples/registration.py b/examples/registration.py
@@ -17,7 +17,7 @@
 print("Registration of a service...")
 zeroconf.registerService(info)
 try:
-    raw_input("Waiting (press Enter to exit)...")
+    input("Waiting (press Enter to exit)...")
 finally:
     print("Unregistering...")
     zeroconf.unregisterService(info)
diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
+
 
 from os.path import abspath, dirname, join
 
diff --git a/test_zeroconf.py b/test_zeroconf.py
@@ -84,7 +84,7 @@ def testNumbers(self):
     def testNumbersQuestions(self):
         generated = r.DNSOutgoing(r._FLAGS_QR_RESPONSE)
         question = r.DNSQuestion("testname.local.", r._TYPE_SRV, r._CLASS_IN)
-        for i in xrange(10):
+        for i in range(10):
             generated.addQuestion(question)
         bytes = generated.packet()
         (numQuestions, numAnswers, numAuthorities,
diff --git a/zeroconf.py b/zeroconf.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
+
 
 """ Multicast DNS Service Discovery for Python, v0.14-wmcbrine
     Copyright 2003 Paul Scott-Murphy, 2014 William McBrine
@@ -43,11 +43,11 @@
     xrange = range
 
 try:
-    unicode
+    str
 except NameError:
-    unicode = str
+    str = str
 
-if isinstance(chr(8), unicode):
+if isinstance(chr(8), str):
     byte_chr = lambda num: bytes([num])
 else:
     byte_chr = chr
@@ -470,7 +470,7 @@ def readHeader(self):
 
     def readQuestions(self):
         """Reads questions section of packet"""
-        for i in xrange(self.numQuestions):
+        for i in range(self.numQuestions):
             name = self.readName()
             type, clazz = self.unpack(b'!HH')
 
@@ -501,7 +501,7 @@ def readOthers(self):
         """Reads the answers, authorities and additionals section of the
         packet"""
         n = self.numAnswers + self.numAuthorities + self.numAdditionals
-        for i in xrange(n):
+        for i in range(n):
             domain = self.readName()
             type, clazz, ttl, length = self.unpack(b'!HHiH')
 
@@ -540,7 +540,7 @@ def isResponse(self):
 
     def readUTF(self, offset, length):
         """Reads a UTF-8 string of a given length from the packet"""
-        return unicode(self.data[offset:offset + length], 'utf-8', 'replace')
+        return str(self.data[offset:offset + length], 'utf-8', 'replace')
 
     def readName(self):
         """Reads a domain name from the packet"""
@@ -787,7 +787,7 @@ def entries(self):
         def add(x, y):
             return x + y
         try:
-            return reduce(add, self.cache.values())
+            return reduce(add, list(self.cache.values()))
         except Exception:  # TODO stop catching all Exceptions
             return []
 
@@ -838,7 +838,7 @@ def run(self):
     def getReaders(self):
         result = []
         self.condition.acquire()
-        result = self.readers.keys()
+        result = list(self.readers.keys())
         self.condition.release()
         return result
 
@@ -993,7 +993,7 @@ def run(self):
             if self.nextTime <= now:
                 out = DNSOutgoing(_FLAGS_QR_QUERY)
                 out.addQuestion(DNSQuestion(self.type, _TYPE_PTR, _CLASS_IN))
-                for record in self.services.values():
+                for record in list(self.services.values()):
                     if not record.isExpired(now):
                         out.addAnswerAtTime(record, now)
                 self.zc.send(out)
@@ -1047,12 +1047,12 @@ def setProperties(self, properties):
             result = b''
             for key in properties:
                 value = properties[key]
-                if isinstance(key, unicode):
+                if isinstance(key, str):
                     key = key.encode('utf-8')
 
                 if value is None:
                     suffix = b''
-                elif isinstance(value, unicode):
+                elif isinstance(value, str):
                     suffix = value.encode('utf-8')
                 elif isinstance(value, int):
                     if value:
@@ -1410,7 +1410,7 @@ def unregisterAllServices(self):
                     now = currentTimeMillis()
                     continue
                 out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
-                for info in self.services.values():
+                for info in list(self.services.values()):
                     out.addAnswerAtTime(DNSPointer(info.type, _TYPE_PTR,
                                                    _CLASS_IN, 0, info.name), 0)
                     out.addAnswerAtTime(DNSService(info.name, _TYPE_SRV,
@@ -1517,13 +1517,13 @@ def handleQuery(self, msg, addr, port):
         for question in msg.questions:
             if question.type == _TYPE_PTR:
                 if question.name == "_services._dns-sd._udp.local.":
-                    for stype in self.servicetypes.keys():
+                    for stype in list(self.servicetypes.keys()):
                         if out is None:
                             out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
                         out.addAnswer(msg,
                                       DNSPointer("_services._dns-sd._udp.local.",
                                                  _TYPE_PTR, _CLASS_IN, _DNS_TTL, stype))
-                for service in self.services.values():
+                for service in list(self.services.values()):
                     if question.name == service.type:
                         if out is None:
                             out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
@@ -1537,7 +1537,7 @@ def handleQuery(self, msg, addr, port):
 
                     # Answer A record queries for any service addresses we know
                     if question.type in (_TYPE_A, _TYPE_ANY):
-                        for service in self.services.values():
+                        for service in list(self.services.values()):
                             if service.server == question.name.lower():
                                 out.addAnswer(msg, DNSAddress(question.name,
                                                               _TYPE_A, _CLASS_IN | _CLASS_UNIQUE,
