Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update versions #18

Merged
merged 5 commits into from
Jul 23, 2018
Merged

Update versions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66ace3c
Allow nightly build to fail
hugovk Jun 17, 2018
b3725ba
Add version classifiers
hugovk Jun 17, 2018
96eaf64
Add python_requires to help pip
hugovk Jun 17, 2018
719afe3
Drop support for EOL Python 3.3
hugovk Jun 17, 2018
8e7ddc0
Drop support for EOL Python 2.6
hugovk Jun 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions ndg/httpsclient/https.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
10 changes: 8 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -161,6 +161,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',
Expand All @@ -174,7 +175,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',
Expand Down