Merge branch 'hugovk-update-versions' into devel

Author: philipkershaw

.travis.yml

@@ -1,11 +1,12 @@
 language: python
 python:
-  - 2.6
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
   - 3.6
   - nightly
 script:
   - python setup.py install
+matrix:
+  allow_failures:
+  - python: nightly

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

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)
 

setup.py

@@ -32,6 +32,7 @@
             ],
     },
     install_requires=['PyOpenSSL', 'pyasn1>=0.1.1'],
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
@@ -45,7 +46,12 @@
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Security',
         'Topic :: Internet',
         'Topic :: Scientific/Engineering',