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

Don't depend on backports.ssl-match-hostname with python >=2.7.9, <3.0 #1276

Closed
wants to merge 1 commit into from
Closed

Don't depend on backports.ssl-match-hostname with python >=2.7.9, <3.0 #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Upgrade notes

As of Tornado 3.2, the `backports.ssl_match_hostname
<https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ package
must be installed when running Tornado on Python 2. This will be
must be installed when running Tornado on Python 2 (<2.7.9). This will be
installed automatically when using ``pip`` or ``easy_install``.

Quick links
Expand Down Expand Up @@ -81,8 +81,8 @@ The Tornado source code is `hosted on GitHub
requires the `certifi <https://pypi.python.org/pypi/certifi>`_ package
on all Python versions, and the `backports.ssl_match_hostname
<https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ package
on Python 2. These will be installed automatically when using
``pip`` or ``easy_install``). Some Tornado features may
on Python 2 (before 2.7.9). These will be installed automatically when
using ``pip`` or ``easy_install``). Some Tornado features may
require one of the following optional libraries:

* `unittest2 <https://pypi.python.org/pypi/unittest2>`_ is needed to run
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ The Tornado source code is `hosted on GitHub
requires the `certifi <https://pypi.python.org/pypi/certifi>`_ package
on all Python versions, and the `backports.ssl_match_hostname
<https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ package
on Python 2. These will be installed automatically when using
``pip`` or ``easy_install``). Some Tornado features may
on Python 2 (before 2.7.9). These will be installed automatically when
using ``pip`` or ``easy_install``). Some Tornado features may
require one of the following optional libraries:

* `unittest2 <https://pypi.python.org/pypi/unittest2>`_ is needed to run
Expand Down
2 changes: 1 addition & 1 deletion maint/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Frozen pip requirements for tools used in the development of tornado.
# This list is for python 3.4; for 2.7 add:
# - backports.ssl-match-hostname
# - backports.ssl-match-hostname (<2.7.9 only)
# - futures
# - mock
#
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def build_extension(self, ext):
if setuptools is not None:
# If setuptools is not available, you're on your own for dependencies.
install_requires = ['certifi']
if sys.version_info < (3, 2):
if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
install_requires.append('backports.ssl_match_hostname')
kwargs['install_requires'] = install_requires

Expand Down