python-tornado: use Python 2.7.9's new SSL library instead of backports.ssl-match-hostname

This commit is contained in:
Alessio Sergi 2014-12-17 11:22:12 +01:00
parent 251a5471b2
commit bb894dfe5c
3 changed files with 22 additions and 8 deletions

View File

@ -1,6 +1,6 @@
diff --git setup.py.orig setup.py
diff --git setup.py setup.py
index f09169f..d42c486 100644
--- setup.py.orig
--- setup.py
+++ setup.py
@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
@ -11,9 +11,9 @@ index f09169f..d42c486 100644
if sys.version_info < (3, 2):
install_requires.append('backports.ssl_match_hostname')
kwargs['install_requires'] = install_requires
diff --git tornado/simple_httpclient.py.orig tornado/simple_httpclient.py
diff --git tornado/simple_httpclient.py tornado/simple_httpclient.py
index f0f73fa..ffe3e40 100644
--- tornado/simple_httpclient.py.orig
--- tornado/simple_httpclient.py
+++ tornado/simple_httpclient.py
@@ -33,17 +33,9 @@ except ImportError:
# ssl is not available on Google App Engine.
@ -34,9 +34,9 @@ index f0f73fa..ffe3e40 100644
class SimpleAsyncHTTPClient(AsyncHTTPClient):
diff --git tornado/test/iostream_test.py.orig tornado/test/iostream_test.py
diff --git tornado/test/iostream_test.py tornado/test/iostream_test.py
index 01b0d95..47a64e7 100644
--- tornado/test/iostream_test.py.orig
--- tornado/test/iostream_test.py
+++ tornado/test/iostream_test.py
@@ -10,7 +10,6 @@ from tornado.stack_context import NullContext
from tornado.testing import AsyncHTTPTestCase, AsyncHTTPSTestCase, AsyncTestCase, bind_unused_port, ExpectLog, gen_test

View File

@ -0,0 +1,14 @@
diff --git setup.py setup.py
index f09169f..f795807 100644
--- setup.py
+++ setup.py
@@ -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 = []
- 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

View File

@ -1,13 +1,13 @@
# Template file for 'python-tornado'
pkgname=python-tornado
version=4.0.2
revision=1
revision=2
wrksrc="tornado-${version}"
build_style=python-module
python_versions="2.7 3.4"
hostmakedepends="python-setuptools python3.4-setuptools"
makedepends="python-devel python3.4-devel"
depends="python-backports-ssl-match-hostname ca-certificates"
depends="ca-certificates"
pycompile_module="tornado"
short_desc="Python2 web framework and asynchronous networking library"
maintainer="Alessio Sergi <al3hex@gmail.com>"