python-tornado: update to 4.2

This commit is contained in:
Alessio Sergi 2015-05-29 20:02:02 +02:00
parent 9501af79d6
commit a8bd3aed36
2 changed files with 9 additions and 30 deletions

View File

@ -3,14 +3,14 @@ index f09169f..d42c486 100644
--- setup.py
+++ setup.py
@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
if setuptools is not None:
# If setuptools is not available, you're on your own for dependencies.
- install_requires = ['certifi']
+ install_requires = []
if sys.version_info < (3, 2):
install_requires.append('backports.ssl_match_hostname')
# Certifi is also optional on 2.7.9+, although making our dependencies
# conditional on micro version numbers seems like a bad idea
# until we have more declarative metadata.
- install_requires.append('certifi')
+ pass
kwargs['install_requires'] = install_requires
setup(
diff --git tornado/simple_httpclient.py tornado/simple_httpclient.py
index f0f73fa..ffe3e40 100644
--- tornado/simple_httpclient.py
@ -34,24 +34,3 @@ index f0f73fa..ffe3e40 100644
class SimpleAsyncHTTPClient(AsyncHTTPClient):
diff --git tornado/test/iostream_test.py tornado/test/iostream_test.py
index 01b0d95..47a64e7 100644
--- 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
from tornado.test.util import unittest, skipIfNonUnix
from tornado.web import RequestHandler, Application
-import certifi
import errno
import logging
import os
@@ -855,7 +854,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
def test_handshake_fail(self):
self.server_start_tls(_server_ssl_options())
client_future = self.client_start_tls(
- dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs=certifi.where()))
+ dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs="/etc/ssl/certs/ca-certificates.crt"))
with ExpectLog(gen_log, "SSL Error"):
with self.assertRaises(ssl.SSLError):
yield client_future

View File

@ -1,6 +1,6 @@
# Template file for 'python-tornado'
pkgname=python-tornado
version=4.1
version=4.2
revision=1
wrksrc="tornado-${version}"
build_style=python-module
@ -14,7 +14,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
homepage="http://www.tornadoweb.org/"
license="Apache-2.0"
distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
checksum=99abd3aede45c93739346ee7384e710120121c3744da155d5cff1c0101702228
checksum=e8b1207da67dbdceebfb291292b4ef1b547d6171525bec1b366853f923456a5f
pre_build() {
# remove shebang