[Python-modules-commits] r32802 - in packages/python-tornado/trunk/debian (7 files)
jpuydt-guest at users.alioth.debian.org
jpuydt-guest at users.alioth.debian.org
Thu May 28 15:38:34 UTC 2015
Date: Thursday, May 28, 2015 @ 15:38:33
Author: jpuydt-guest
Revision: 32802
Update everything for 4.2.0
Modified:
packages/python-tornado/trunk/debian/changelog
packages/python-tornado/trunk/debian/patches/domain-test.patch
packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch
packages/python-tornado/trunk/debian/patches/series
packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch
packages/python-tornado/trunk/debian/patches/sockopt.patch
packages/python-tornado/trunk/debian/patches/without-certifi.patch
Modified: packages/python-tornado/trunk/debian/changelog
===================================================================
--- packages/python-tornado/trunk/debian/changelog 2015-05-28 11:56:55 UTC (rev 32801)
+++ packages/python-tornado/trunk/debian/changelog 2015-05-28 15:38:33 UTC (rev 32802)
@@ -1,4 +1,4 @@
-python-tornado (4.1.0-1) UNRELEASED; urgency=medium
+python-tornado (4.2.0-1) UNRELEASED; urgency=medium
* Update to latest upstream (Closes: #779035)
* Remove patches/certs-path.patch and ignore-ca-certificates.patch (now useless).
Modified: packages/python-tornado/trunk/debian/patches/domain-test.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/domain-test.patch 2015-05-28 11:56:55 UTC (rev 32801)
+++ packages/python-tornado/trunk/debian/patches/domain-test.patch 2015-05-28 15:38:33 UTC (rev 32802)
@@ -1,10 +1,8 @@
Description: use a domain that is more likely invalid
avoids test failures in unisolated builds
-diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
-index 1df1e32..ee664dc 100644
--- a/tornado/test/netutil_test.py
+++ b/tornado/test/netutil_test.py
-@@ -56,7 +56,7 @@ class _ResolverErrorTestMixin(object):
+@@ -56,7 +56,7 @@
return True # Halt propagation.
with ExceptionStackContext(handler):
@@ -13,7 +11,7 @@
result = self.wait()
self.assertIsInstance(result, Exception)
-@@ -64,7 +64,7 @@ class _ResolverErrorTestMixin(object):
+@@ -64,7 +64,7 @@
@gen_test
def test_future_interface_bad_host(self):
with self.assertRaises(Exception):
@@ -21,4 +19,4 @@
+ yield self.resolver.resolve('ana8sdasdadasdasdas1d12invalidsdasdbwefrwfejnefsegfsdomain', 80,
socket.AF_UNSPEC)
- def _failing_getaddrinfo(*args):
+
Modified: packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch 2015-05-28 11:56:55 UTC (rev 32801)
+++ packages/python-tornado/trunk/debian/patches/ignoreuserwarning.patch 2015-05-28 15:38:33 UTC (rev 32802)
@@ -1,11 +1,9 @@
Description: ignore userwarning in tests
Required to run tests from source with the package already installed.
Else one gets check_version_conflict warning from pkg_resources.
-diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
-index acbb569..ee3c603 100644
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
-@@ -95,6 +95,7 @@ def main():
+@@ -99,6 +99,7 @@
# setuptools sometimes gives ImportWarnings about things that are on
# sys.path even if they're not being used.
warnings.filterwarnings("ignore", category=ImportWarning)
Modified: packages/python-tornado/trunk/debian/patches/series
===================================================================
--- packages/python-tornado/trunk/debian/patches/series 2015-05-28 11:56:55 UTC (rev 32801)
+++ packages/python-tornado/trunk/debian/patches/series 2015-05-28 15:38:33 UTC (rev 32802)
@@ -1,5 +1 @@
-domain-test.patch
-ignoreuserwarning.patch
-skip-timing-tests.patch
-sockopt.patch
without-certifi.patch
Modified: packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch 2015-05-28 11:56:55 UTC (rev 32801)
+++ packages/python-tornado/trunk/debian/patches/skip-timing-tests.patch 2015-05-28 15:38:33 UTC (rev 32802)
@@ -1,9 +1,7 @@
Description: like travis buildd are often slow so skip the same tests
-diff --git a/tornado/test/util.py b/tornado/test/util.py
-index 358809f..786e72e 100644
--- a/tornado/test/util.py
+++ b/tornado/test/util.py
-@@ -21,7 +21,7 @@ skipIfNonUnix = unittest.skipIf(os.name != 'posix' or sys.platform == 'cygwin',
+@@ -21,7 +21,7 @@
# travis-ci.org runs our tests in an overworked virtual machine, which makes
# timing-related tests unreliable.
Modified: packages/python-tornado/trunk/debian/patches/sockopt.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/sockopt.patch 2015-05-28 11:56:55 UTC (rev 32801)
+++ packages/python-tornado/trunk/debian/patches/sockopt.patch 2015-05-28 15:38:33 UTC (rev 32802)
@@ -1,10 +1,8 @@
Description: Ignore ENOPROTOOPT errors from SO_REUSEADDR or SO_ERROR on AF_UNIX sockets, for
systems which do not implement them there.
-diff --git a/tornado/iostream.py b/tornado/iostream.py
-index cdb6250..dd2624c 100644
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
-@@ -1114,7 +1114,12 @@ class IOStream(BaseIOStream):
+@@ -1158,7 +1158,12 @@
return future
def _handle_connect(self):
@@ -18,11 +16,9 @@
if err != 0:
self.error = socket.error(err, os.strerror(err))
# IOLoop implementations may vary: some of them return
-diff --git a/tornado/netutil.py b/tornado/netutil.py
-index 17e9580..895fb1d 100644
--- a/tornado/netutil.py
+++ b/tornado/netutil.py
-@@ -122,7 +122,11 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC,
+@@ -164,7 +164,11 @@
raise
set_close_exec(sock.fileno())
if os.name != 'nt':
Modified: packages/python-tornado/trunk/debian/patches/without-certifi.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/without-certifi.patch 2015-05-28 11:56:55 UTC (rev 32801)
+++ packages/python-tornado/trunk/debian/patches/without-certifi.patch 2015-05-28 15:38:33 UTC (rev 32802)
@@ -1,25 +1,17 @@
-Description: do not depend on certifi for Debian
- On debian certificates are stored in a definite place
-Forwarded: no
-Author: Julien Puydt <julien.puydt at laposte.net>
-diff --git a/setup.py b/setup.py
-index 963a6dd..d61244f 100644
--- a/setup.py
+++ b/setup.py
-@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
+@@ -128,7 +128,7 @@
+ # 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 # install_requires.append('certifi')
+ kwargs['install_requires'] = install_requires
- 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')
- kwargs['install_requires'] = install_requires
-diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
-index 31d076e..a7c8412 100644
+ setup(
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
-@@ -33,17 +33,8 @@ except ImportError:
+@@ -33,18 +33,8 @@
# ssl is not available on Google App Engine.
ssl = None
@@ -34,28 +26,44 @@
- raise Exception("The 'certifi' package is required to use https "
- "in simple_httpclient")
- return certifi.where()
-+ return '/etc/ssl/certs/ca-certificates.crt'
+-
++ return '/etc/ssl/certs/ca-certificates.crt'
+ class SimpleAsyncHTTPClient(AsyncHTTPClient):
+ """Non-blocking HTTP client with no external dependencies.
+--- a/tornado/netutil.py
++++ b/tornado/netutil.py
+@@ -36,15 +36,6 @@
+ ssl = None
- class SimpleAsyncHTTPClient(AsyncHTTPClient):
-diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
-index ca35de6..5f428e0 100644
---- a/tornado/test/iostream_test.py
-+++ b/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, refusing_port
- from tornado.web import RequestHandler, Application
--import certifi
- import errno
- import logging
- import os
-@@ -877,7 +876,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
- def test_handshake_fail(self):
- server_future = 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
+ try:
+- import certifi
+-except ImportError:
+- # certifi is optional as long as we have ssl.create_default_context.
+- if ssl is None or hasattr(ssl, 'create_default_context'):
+- certifi = None
+- else:
+- raise
+-
+-try:
+ xrange # py2
+ except NameError:
+ xrange = range # py3
+@@ -72,7 +63,7 @@
+ # Python 3.2-3.3
+ _client_ssl_defaults = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+ _client_ssl_defaults.verify_mode = ssl.CERT_REQUIRED
+- _client_ssl_defaults.load_verify_locations(certifi.where())
++ _client_ssl_defaults.load_verify_locations('/etc/ssl/certs/ca-certificates.crt')
+ _server_ssl_defaults = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+ if hasattr(ssl, 'OP_NO_COMPRESSION'):
+ # Disable TLS compression to avoid CRIME and related attacks.
+@@ -83,7 +74,7 @@
+ elif ssl:
+ # Python 2.6-2.7.8
+ _client_ssl_defaults = dict(cert_reqs=ssl.CERT_REQUIRED,
+- ca_certs=certifi.where())
++ ca_certs='/etc/ssl/certs/ca-certificates.crt')
+ _server_ssl_defaults = {}
+ else:
+ # Google App Engine
More information about the Python-modules-commits
mailing list