Drop support for Python 2 and 3.3

jstasiak · jstasiak · commit f22f421e4e6b · 2017-09-26T01:45:21.000+02:00
This simplifies the code slightly, reduces the number of dependencies
and otherwise speeds up the CI process. If someone *really* needs to use
really old Python they have the option of using older versions of the
package.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,9 @@
 language: python
 python:
-    - "2.7"
-    - "3.3"
     - "3.4"
     - "3.5"
     - "3.6"
-    - "pypy"
-    - "pypy3.3-5.2-alpha1"
+    - "pypy3.5-5.8.0"
 matrix:
     fast_finish: true
 install:
diff --git a/README.rst b/README.rst
@@ -43,9 +43,8 @@ Compared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf:
 Python compatibility
 --------------------
 
-* CPython 2.7, 3.3+
-* PyPy 2.2+ (possibly 1.9-2.1 as well)
-* PyPy3 2.4+
+* CPython 3.4+
+* PyPy3 5.8+
 
 Versioning
 ----------
@@ -82,11 +81,10 @@ Here's an example of browsing for a service:
 
 .. code-block:: python
 
-    from six.moves import input
     from zeroconf import ServiceBrowser, Zeroconf
     
     
-    class MyListener(object):
+    class MyListener:
     
         def remove_service(self, zeroconf, type, name):
             print("Service %s removed" % (name,))
@@ -122,6 +120,11 @@ See examples directory for more.
 Changelog
 =========
 
+0.20.0
+------
+
+* Dropped support for Python 2 (this includes PyPy) and 3.3
+
 0.19.1
 ------
 
diff --git a/examples/browser.py b/examples/browser.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function, unicode_literals
+#!/usr/bin/env python3
 
 """ Example of browsing for a service (in this case, HTTP) """
 
diff --git a/examples/registration.py b/examples/registration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """ Example of announcing a service (in this case, a fake HTTP server) """
 
diff --git a/examples/self_test.py b/examples/self_test.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function, unicode_literals
+#!/usr/bin/env python3
 
 import logging
 import socket
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,16 +1,13 @@
 autopep8
 coveralls
 coverage
-enum34
 # Upper bound because of https://github.com/PyCQA/flake8-import-order/issues/79
 flake8<3
 flake8-blind-except
 # Upper bound because of https://github.com/public/flake8-import-order/issues/42
 flake8-import-order>=0.4.0, <0.6.0
-mock
 # See setup.py comment for why this version is restricted
 netifaces!=0.10.5
 nose
 pep8==1.5.7
 pep8-naming
-six
diff --git a/setup.py b/setup.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
-
+#!/usr/bin/env python3
 from io import open
 
 from os.path import abspath, dirname, join
@@ -55,12 +53,10 @@
         'mDNS',
     ],
     install_requires=[
-        'enum-compat',
         # netifaces 0.10.5 has a bug that results in all interfaces' netmasks
         # to be 255.255.255.255 on Windows which breaks things. See:
         # * https://github.com/jstasiak/python-zeroconf/issues/84
         # * https://bitbucket.org/al45tair/netifaces/issues/39/netmask-is-always-255255255255
         'netifaces!=0.10.5',
-        'six',
     ],
 )
diff --git a/test_zeroconf.py b/test_zeroconf.py
@@ -12,9 +12,6 @@
 import unittest
 from threading import Event
 
-from six import indexbytes
-from six.moves import xrange
-
 import zeroconf as r
 from zeroconf import (
     DNSHinfo,
@@ -189,19 +186,19 @@ def test_transaction_id(self):
         """ID must be zero in a DNS-SD packet"""
         generated = r.DNSOutgoing(r._FLAGS_QR_QUERY)
         bytes = generated.packet()
-        id = indexbytes(bytes, 0) << 8 | indexbytes(bytes, 1)
+        id = bytes[0] << 8 | bytes[1]
         self.assertEqual(id, 0)
 
     def test_query_header_bits(self):
         generated = r.DNSOutgoing(r._FLAGS_QR_QUERY)
         bytes = generated.packet()
-        flags = indexbytes(bytes, 2) << 8 | indexbytes(bytes, 3)
+        flags = bytes[2] << 8 | bytes[3]
         self.assertEqual(flags, 0x0)
 
     def test_response_header_bits(self):
         generated = r.DNSOutgoing(r._FLAGS_QR_RESPONSE)
         bytes = generated.packet()
-        flags = indexbytes(bytes, 2) << 8 | indexbytes(bytes, 3)
+        flags = bytes[2] << 8 | bytes[3]
         self.assertEqual(flags, 0x8000)
 
     def test_numbers(self):
@@ -217,7 +214,7 @@ def test_numbers(self):
     def test_numbers_questions(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.add_question(question)
         bytes = generated.packet()
         (numQuestions, numAnswers, numAuthorities,
@@ -316,7 +313,7 @@ def on_service_state_change(zeroconf, service_type, state_change, name):
         assert longest_packet[0] >= r._MAX_MSG_ABSOLUTE - 100
 
         # mock zeroconf's logger warning() and debug()
-        from mock import patch
+        from unittest.mock import patch
         patch_warn = patch('zeroconf.log.warning')
         patch_debug = patch('zeroconf.log.debug')
         mocked_log_warn = patch_warn.start()
@@ -622,7 +619,7 @@ def test_integration_with_listener_class(self):
         name = "xxxyyy"
         registration_name = "%s.%s" % (name, type_)
 
-        class MyListener(object):
+        class MyListener:
             def add_service(self, zeroconf, type, name):
                 zeroconf.get_service_info(type, name)
                 service_added.set()
diff --git a/zeroconf.py b/zeroconf.py
@@ -1,6 +1,3 @@
-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
 
@@ -36,8 +33,6 @@
 from functools import reduce
 
 import netifaces
-from six import binary_type, indexbytes, int2byte, iteritems, text_type
-from six.moves import xrange
 
 __author__ = 'Paul Scott-Murphy, William McBrine'
 __maintainer__ = 'Jakub Stasiak <jakub@stasiak.at>'
@@ -151,6 +146,8 @@
 _HAS_ONLY_A_TO_Z_NUM_HYPHEN = re.compile(r'^[A-Za-z0-9\-]+$')
 _HAS_ASCII_CONTROL_CHARS = re.compile(r'[\x00-\x1f\x7f]')
 
+int2byte = struct.Struct(">B").pack
+
 
 @enum.unique
 class InterfaceChoice(enum.Enum):
@@ -309,7 +306,7 @@ class BadTypeInNameException(Error):
 # implementation classes
 
 
-class QuietLogger(object):
+class QuietLogger:
     _seen_logs = {}
 
     @classmethod
@@ -338,7 +335,7 @@ def log_warning_once(cls, *args):
         logger(*args)
 
 
-class DNSEntry(object):
+class DNSEntry:
 
     """A DNS entry"""
 
@@ -666,7 +663,7 @@ def read_header(self):
 
     def read_questions(self):
         """Reads questions section of packet"""
-        for i in xrange(self.num_questions):
+        for i in range(self.num_questions):
             name = self.read_name()
             type_, class_ = self.unpack(b'!HH')
 
@@ -679,7 +676,7 @@ def read_questions(self):
 
     def read_character_string(self):
         """Reads a character string from the packet"""
-        length = indexbytes(self.data, self.offset)
+        length = self.data[self.offset]
         self.offset += 1
         return self.read_string(length)
 
@@ -697,7 +694,7 @@ def read_others(self):
         """Reads the answers, authorities and additionals section of the
         packet"""
         n = self.num_answers + self.num_authorities + self.num_additionals
-        for i in xrange(n):
+        for i in range(n):
             domain = self.read_name()
             type_, class_, ttl, length = self.unpack(b'!HHiH')
 
@@ -742,7 +739,7 @@ def is_response(self):
 
     def read_utf(self, offset, length):
         """Reads a UTF-8 string of a given length from the packet"""
-        return text_type(self.data[offset:offset + length], 'utf-8', 'replace')
+        return str(self.data[offset:offset + length], 'utf-8', 'replace')
 
     def read_name(self):
         """Reads a domain name from the packet"""
@@ -752,7 +749,7 @@ def read_name(self):
         first = off
 
         while True:
-            length = indexbytes(self.data, off)
+            length = self.data[off]
             off += 1
             if length == 0:
                 break
@@ -763,7 +760,7 @@ def read_name(self):
             elif t == 0xC0:
                 if next_ < 0:
                     next_ = off + 1
-                off = ((length & 0x3F) << 8) | indexbytes(self.data, off)
+                off = ((length & 0x3F) << 8) | self.data[off]
                 if off >= first:
                     raise IncomingDecodeError(
                         "Bad domain name (circular) at %s" % (off,))
@@ -779,7 +776,7 @@ def read_name(self):
         return result
 
 
-class DNSOutgoing(object):
+class DNSOutgoing:
 
     """Object representation of an outgoing packet"""
 
@@ -1033,7 +1030,7 @@ def packet(self):
         return b''.join(self.data)
 
 
-class DNSCache(object):
+class DNSCache:
 
     """A cache of DNS entries"""
 
@@ -1217,7 +1214,7 @@ def run(self):
                     self.zc.cache.remove(record)
 
 
-class Signal(object):
+class Signal:
     def __init__(self):
         self._handlers = []
 
@@ -1230,7 +1227,7 @@ def registration_interface(self):
         return SignalRegistrationInterface(self._handlers)
 
 
-class SignalRegistrationInterface(object):
+class SignalRegistrationInterface:
 
     def __init__(self, handlers):
         self._handlers = handlers
@@ -1363,7 +1360,7 @@ def run(self):
                 handler(self.zc)
 
 
-class ServiceInfo(object):
+class ServiceInfo:
 
     """Service information"""
 
@@ -1406,15 +1403,15 @@ def _set_properties(self, properties):
             self._properties = properties
             list_ = []
             result = b''
-            for key, value in iteritems(properties):
-                if isinstance(key, text_type):
+            for key, value in properties.items():
+                if isinstance(key, str):
                     key = key.encode('utf-8')
 
                 if value is None:
                     suffix = b''
-                elif isinstance(value, text_type):
+                elif isinstance(value, str):
                     suffix = value.encode('utf-8')
-                elif isinstance(value, binary_type):
+                elif isinstance(value, bytes):
                     suffix = value
                 elif isinstance(value, int):
                     if value:
@@ -1438,7 +1435,7 @@ def _set_text(self, text):
         index = 0
         strs = []
         while index < end:
-            length = indexbytes(text, index)
+            length = text[index]
             index += 1
             strs.append(text[index:index + length])
             index += length
@@ -1571,7 +1568,7 @@ def __repr__(self):
         )
 
 
-class ZeroconfServiceTypes(object):
+class ZeroconfServiceTypes:
     """
     Return all of the advertised services on any local networks
     """

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`
`3`	`3`	`""" Example of announcing a service (in this case, a fake HTTP server) """`
`4`	`4`