PROTON-2319: Some more leftovers from python 2.6
diff --git a/INSTALL.md b/INSTALL.md
index 38fcc79..5cdeb2c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -18,11 +18,11 @@
Linux dependencies
- GNU Make 3.81+
- - GCC 4.4+
+ - GCC 4.8.4+
- Cyrus SASL 2.1+ (for SASL support)
- OpenSSL 1.0+ (for SSL support)
- JsonCpp 1.8+ for C++ connection configuration file support
- - Python 2.6+ (for the Python binding)
+ - Python 2.7, 3.5+ (for the Python binding)
Windows dependencies
diff --git a/python/proton/__init__.py b/python/proton/__init__.py
index 6c124c5..ddb41a4 100644
--- a/python/proton/__init__.py
+++ b/python/proton/__init__.py
@@ -114,21 +114,7 @@
IMPLEMENTATION_LANGUAGE = "C"
-# This private NullHandler is required for Python 2.6,
-# when we no longer support 2.6 replace this NullHandler class definition and assignment with:
-# handler = logging.NullHandler()
-class NullHandler(logging.Handler):
- def handle(self, record):
- pass
-
- def emit(self, record):
- pass
-
- def createLock(self):
- self.lock = None
-
-
-handler = NullHandler()
+handler = logging.NullHandler()
logconfigfile = os.getenv('PNPY_LOGGER_CONFIG', None)
if logconfigfile:
diff --git a/python/tests/proton_tests/codec.py b/python/tests/proton_tests/codec.py
index bc66463..e3bffe5 100644
--- a/python/tests/proton_tests/codec.py
+++ b/python/tests/proton_tests/codec.py
@@ -489,11 +489,7 @@
assert data.get_object() == b"foo"
def testMemoryView(self):
- try:
- self.data.put_object(memoryview(b"foo"))
- except NameError:
- # python <= 2.6 does not have `memoryview`
- return
+ self.data.put_object(memoryview(b"foo"))
data = Data()
data.decode(self.data.encode())
data.rewind()
