Drop support for EOL Python 2.6

cedadev · Jun 17, 2018 · 8e7ddc0 · 8e7ddc0
1 parent 719afe3
commit 8e7ddc0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - 2.6
   - 2.7
   - 3.4
   - 3.5

diff --git a/README.md b/README.md
@@ -82,9 +82,9 @@ Initial release
 
 Prerequisites
 =============
-This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 
+This has been developed and tested for Python 2.7 with pyOpenSSL 0.13 
 and 0.14.  Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and 
-3.4.  Note that proxy support is only available from Python 2.6.2 onwards.  
+3.4. 
 ``pyasn1`` is required for correct SSL verification with ``subjectAltNames``.
 
 Installation

diff --git a/ndg/httpsclient/https.py b/ndg/httpsclient/https.py
@@ -78,10 +78,9 @@ def connect(self):
 
         sock = socket.create_connection((self.host, self.port), self.timeout)
 
-        # Tunnel if using a proxy - ONLY available for Python 2.6.2 and above      
-        if getattr(self, '_tunnel_host', None):
-            self.sock = sock
-            self._tunnel()
+        # Tunnel if using a proxy
+        self.sock = sock
+        self._tunnel()
 
         self.sock = SSLSocket(ssl_context, sock)
 

diff --git a/setup.py b/setup.py
@@ -94,9 +94,9 @@
 
 Prerequisites
 =============
-This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13
+This has been developed and tested for Python 2.7 with pyOpenSSL 0.13
 and 0.14.  Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and
-3.4.  Note that proxy support is only available from Python 2.6.2 onwards.
+3.4.
 ``pyasn1`` is required for correct SSL verification with ``subjectAltNames``.
 
 Installation
@@ -161,7 +161,7 @@
             ],
     },
     install_requires=['PyOpenSSL', 'pyasn1>=0.1.1'],
-    python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
@@ -176,7 +176,6 @@
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',