Drop Python 2.6 support, no excuse to use 2.6 these days

jstasiak · jstasiak · commit 56ea54245eea · 2017-02-01T13:59:53.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-    - "2.6"
     - "2.7"
     - "3.3"
     - "3.4"
diff --git a/README.rst b/README.rst
@@ -43,7 +43,7 @@ Compared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf:
 Python compatibility
 --------------------
 
-* CPython 2.6, 2.7, 3.3+
+* CPython 2.7, 3.3+
 * PyPy 2.2+ (possibly 1.9-2.1 as well)
 * PyPy3 2.4+
 
@@ -122,6 +122,11 @@ See examples directory for more.
 Changelog
 =========
 
+0.18.0 (not released yet)
+-------------------------
+
+* Dropped Python 2.6 support
+
 0.17.7
 ------
 
diff --git a/zeroconf.py b/zeroconf.py
@@ -45,15 +45,6 @@
 __license__ = 'LGPL'
 
 
-try:
-    NullHandler = logging.NullHandler
-except AttributeError:
-    # Python 2.6 fallback
-    class NullHandler(logging.Handler):
-
-        def emit(self, record):
-            pass
-
 __all__ = [
     "__version__",
     "Zeroconf", "ServiceInfo", "ServiceBrowser",
@@ -62,7 +53,7 @@ def emit(self, record):
 
 
 log = logging.getLogger(__name__)
-log.addHandler(NullHandler())
+log.addHandler(logging.NullHandler())
 
 if log.level == logging.NOTSET:
     log.setLevel(logging.WARN)

-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 language: python
 python:
 -    - "2.6"
     - "2.7"
     - "3.3"
     - "3.4"