Skip to content

Commit 8e7ddc0

Browse files
committed
Drop support for EOL Python 2.6
1 parent 719afe3 commit 8e7ddc0

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
22
python:
3-
- 2.6
43
- 2.7
54
- 3.4
65
- 3.5

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ Initial release
8282

8383
Prerequisites
8484
=============
85-
This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13
85+
This has been developed and tested for Python 2.7 with pyOpenSSL 0.13
8686
and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and
87-
3.4. Note that proxy support is only available from Python 2.6.2 onwards.
87+
3.4.
8888
``pyasn1`` is required for correct SSL verification with ``subjectAltNames``.
8989

9090
Installation

ndg/httpsclient/https.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,9 @@ def connect(self):
7878

7979
sock = socket.create_connection((self.host, self.port), self.timeout)
8080

81-
# Tunnel if using a proxy - ONLY available for Python 2.6.2 and above
82-
if getattr(self, '_tunnel_host', None):
83-
self.sock = sock
84-
self._tunnel()
81+
# Tunnel if using a proxy
82+
self.sock = sock
83+
self._tunnel()
8584

8685
self.sock = SSLSocket(ssl_context, sock)
8786

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494
9595
Prerequisites
9696
=============
97-
This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13
97+
This has been developed and tested for Python 2.7 with pyOpenSSL 0.13
9898
and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and
99-
3.4. Note that proxy support is only available from Python 2.6.2 onwards.
99+
3.4.
100100
``pyasn1`` is required for correct SSL verification with ``subjectAltNames``.
101101
102102
Installation
@@ -161,7 +161,7 @@
161161
],
162162
},
163163
install_requires=['PyOpenSSL', 'pyasn1>=0.1.1'],
164-
python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
164+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
165165
classifiers=[
166166
'Development Status :: 5 - Production/Stable',
167167
'Environment :: Console',
@@ -176,7 +176,6 @@
176176
'Operating System :: POSIX :: Linux',
177177
'Programming Language :: Python',
178178
'Programming Language :: Python :: 2',
179-
'Programming Language :: Python :: 2.6',
180179
'Programming Language :: Python :: 2.7',
181180
'Programming Language :: Python :: 3',
182181
'Programming Language :: Python :: 3.4',

0 commit comments

Comments
 (0)