[Python-modules-commits] [python-tornado] 09/10: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Sat Jul 16 20:52:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-tornado.
commit 948defeb61edf2d2dfab7e05ed776ba61f4df3da
Merge: b6d239e d788743
Author: Ondřej Nový <onovy at debian.org>
Date: Sat Jul 16 22:46:25 2016 +0200
merge patched into master
README.rst | 4 ++++
debian/.git-dpm | 6 +++---
debian/patches/domain-test.patch | 2 +-
debian/patches/fix-ftbfs-on-hurd.patch | 2 +-
debian/patches/ignoreuserwarning.patch | 2 +-
debian/patches/skip-timing-tests.patch | 2 +-
debian/patches/sockopt.patch | 2 +-
debian/patches/without-certifi.patch | 4 ++--
demos/benchmark/benchmark.py | 10 +++++-----
docs/releases/v4.4.0.rst | 4 ++--
setup.py | 2 +-
tornado/__init__.py | 4 ++--
tornado/test/simple_httpclient_test.py | 13 +++++++------
13 files changed, 31 insertions(+), 26 deletions(-)
diff --cc debian/.git-dpm
index e02e82b,0000000..af83562
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 2998294384b06ad3d32359a0ca4bdd85e988149f
- 2998294384b06ad3d32359a0ca4bdd85e988149f
- 79df192d3e61b67beffe0f43f3ffb1c0e0f622b3
++d788743197974e6172dd415564125a001d52cb79
++d788743197974e6172dd415564125a001d52cb79
++22d6b922f8043ee903340dc670a753f1ccad0a8d
+22d6b922f8043ee903340dc670a753f1ccad0a8d
+python-tornado_4.4.0.orig.tar.gz
+c28675e944f364ee96dda3a8d2527a87ed28cfa3
+481165
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/domain-test.patch
index 753cb34,0000000..d281d94
mode 100644,000000..100644
--- a/debian/patches/domain-test.patch
+++ b/debian/patches/domain-test.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 4077934083d0bf1b20e9e45ac08eadff3334cacb Mon Sep 17 00:00:00 2001
++From 72bc7994b46534d9c154347fbe5af6dc68d681f7 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:13:30 -0700
+Subject: use a domain that is more likely invalid
+
+ avoids test failures in unisolated builds
+Patch-Name: domain-test.patch
+---
+ tornado/test/netutil_test.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
+index 549c4fe..842a195 100644
+--- a/tornado/test/netutil_test.py
++++ b/tornado/test/netutil_test.py
+@@ -57,7 +57,7 @@ class _ResolverErrorTestMixin(object):
+ return True # Halt propagation.
+
+ with ExceptionStackContext(handler):
+- self.resolver.resolve('an invalid domain', 80, callback=self.stop)
++ self.resolver.resolve('anasdas23dadasdasdasdi2n1validsdasdbwefrwfejnefsegfsdomain', 80, callback=self.stop)
+
+ result = self.wait()
+ self.assertIsInstance(result, Exception)
+@@ -65,7 +65,7 @@ class _ResolverErrorTestMixin(object):
+ @gen_test
+ def test_future_interface_bad_host(self):
+ with self.assertRaises(IOError):
+- yield self.resolver.resolve('an invalid domain', 80,
++ yield self.resolver.resolve('ana8sdasdadasdasdas1d12invalidsdasdbwefrwfejnefsegfsdomain', 80,
+ socket.AF_UNSPEC)
+
+
diff --cc debian/patches/fix-ftbfs-on-hurd.patch
index d78858d,0000000..18360be
mode 100644,000000..100644
--- a/debian/patches/fix-ftbfs-on-hurd.patch
+++ b/debian/patches/fix-ftbfs-on-hurd.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 2998294384b06ad3d32359a0ca4bdd85e988149f Mon Sep 17 00:00:00 2001
++From d788743197974e6172dd415564125a001d52cb79 Mon Sep 17 00:00:00 2001
+From: Mattia Rizzolo <mattia at debian.org>
+Date: Sat, 21 May 2016 21:55:27 +0000
+Subject: skip UnixSocketTest on hurd, as unix sockets with SO_REUSEADDR are
+ not supported there
+
+ A little discussion about unix sockets with SO_REUSEADDR can be found on
+ https://lists.gnu.org/archive/html/bug-hurd/2016-01/msg00039.html
+
+Forwarded: no
+Patch-Name: fix-ftbfs-on-hurd.patch
+---
+ tornado/test/httpserver_test.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
+index 27052e6..1e1a561 100644
+--- a/tornado/test/httpserver_test.py
++++ b/tornado/test/httpserver_test.py
+@@ -555,6 +555,8 @@ class ManualProtocolTest(HandlerBaseTestCase):
+
+ @unittest.skipIf(not hasattr(socket, 'AF_UNIX') or sys.platform == 'cygwin',
+ "unix sockets not supported on this platform")
++ at unittest.skipIf(sys.platform == 'gnu0',
++ "unix sockets with SO_REUSEADDR not supported on this platform")
+ class UnixSocketTest(AsyncTestCase):
+ """HTTPServers can listen on Unix sockets too.
+
diff --cc debian/patches/ignoreuserwarning.patch
index 722fd9f,0000000..91f5ed1
mode 100644,000000..100644
--- a/debian/patches/ignoreuserwarning.patch
+++ b/debian/patches/ignoreuserwarning.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 37c507261d4316955cc831ac44994ce42094cfae Mon Sep 17 00:00:00 2001
++From 0282833ff6959fe18e28251c673009866176cc25 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:13:31 -0700
+Subject: 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.
+Patch-Name: ignoreuserwarning.patch
+---
+ tornado/test/runtests.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
+index f4dd46d..a0c8684 100644
+--- a/tornado/test/runtests.py
++++ b/tornado/test/runtests.py
+@@ -101,6 +101,7 @@ def main():
+ # setuptools sometimes gives ImportWarnings about things that are on
+ # sys.path even if they're not being used.
+ warnings.filterwarnings("ignore", category=ImportWarning)
++ warnings.filterwarnings("ignore", category=UserWarning)
+ # Tornado generally shouldn't use anything deprecated, but some of
+ # our dependencies do (last match wins).
+ warnings.filterwarnings("ignore", category=DeprecationWarning)
diff --cc debian/patches/skip-timing-tests.patch
index fa1ce1a,0000000..f15e20f
mode 100644,000000..100644
--- a/debian/patches/skip-timing-tests.patch
+++ b/debian/patches/skip-timing-tests.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 16f3fe74ac2d7ebd92ddd81538f0d1396487f5cb Mon Sep 17 00:00:00 2001
++From 22c007e3bb30d251d9fd5920f0da84009b1d197d Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:13:32 -0700
+Subject: like travis buildd are often slow so skip the same tests
+
+Patch-Name: skip-timing-tests.patch
+---
+ tornado/test/util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tornado/test/util.py b/tornado/test/util.py
+index 2e3d779..33b9cf0 100644
+--- a/tornado/test/util.py
++++ b/tornado/test/util.py
+@@ -23,7 +23,7 @@ skipIfNonUnix = unittest.skipIf(os.name != 'posix' or sys.platform == 'cygwin',
+
+ # travis-ci.org runs our tests in an overworked virtual machine, which makes
+ # timing-related tests unreliable.
+-skipOnTravis = unittest.skipIf('TRAVIS' in os.environ,
++skipOnTravis = unittest.skipIf(True,
+ 'timing tests unreliable on travis')
+
+ skipOnAppEngine = unittest.skipIf('APPENGINE_RUNTIME' in os.environ,
diff --cc debian/patches/sockopt.patch
index c623e7f,0000000..34d3884
mode 100644,000000..100644
--- a/debian/patches/sockopt.patch
+++ b/debian/patches/sockopt.patch
@@@ -1,55 -1,0 +1,55 @@@
- From cf270226d38a9e231d77fa6b7f4e94358bf8d65f Mon Sep 17 00:00:00 2001
++From d345ec29447f22b86a06a45fdb71597533fed4f8 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:13:33 -0700
+Subject: Ignore ENOPROTOOPT errors from SO_REUSEADDR or SO_ERROR on AF_UNIX
+ sockets, for
+
+systems which do not implement them there.
+Patch-Name: sockopt.patch
+---
+ tornado/iostream.py | 7 ++++++-
+ tornado/netutil.py | 12 ++++++++++--
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/tornado/iostream.py b/tornado/iostream.py
+index bcf4441..b5f49fa 100644
+--- a/tornado/iostream.py
++++ b/tornado/iostream.py
+@@ -1174,7 +1174,12 @@ class IOStream(BaseIOStream):
+ return future
+
+ def _handle_connect(self):
+- err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
++ try:
++ err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
++ except socket.error as e:
++ err = e.args[0]
++ if err == errno.ENOPROTOOPT:
++ err = 0
+ 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 5cbcdb9..b7113d6 100644
+--- a/tornado/netutil.py
++++ b/tornado/netutil.py
+@@ -169,9 +169,17 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC,
+ raise
+ set_close_exec(sock.fileno())
+ if os.name != 'nt':
+- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
++ try:
++ sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
++ except socket.error as e:
++ if e.args[0] != errno.ENOPROTOOPT:
++ raise
+ if reuse_port:
+- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
++ try:
++ sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
++ except socket.error as e:
++ if e.args[0] != errno.ENOPROTOOPT:
++ raise
+ if af == socket.AF_INET6:
+ # On linux, ipv6 sockets accept ipv4 too by default,
+ # but this makes it impossible to bind to both
diff --cc debian/patches/without-certifi.patch
index 79d8cb1,0000000..af0687d
mode 100644,000000..100644
--- a/debian/patches/without-certifi.patch
+++ b/debian/patches/without-certifi.patch
@@@ -1,91 -1,0 +1,91 @@@
- From 0e84d753748d9c4eeffd30d2363eeacd9bd79630 Mon Sep 17 00:00:00 2001
++From d998a5bbfd52f5eb1aa769569083ef293e204514 Mon Sep 17 00:00:00 2001
+From: Julien Puydt <julien.puydt at laposte.net>
+Date: Thu, 8 Oct 2015 13:13:34 -0700
+Subject: remove dependance on certifi
+
+ Since Debian is a distribution, we know where the certificates are
+ and don't need certifi to find them.
+Forwarded: no
+
+Patch-Name: without-certifi.patch
+---
+ setup.py | 2 +-
+ tornado/netutil.py | 13 ++-----------
+ tornado/simple_httpclient.py | 12 +-----------
+ 3 files changed, 4 insertions(+), 23 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index a64bc3a..2423793 100644
++index 836c363..f7770d1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -136,7 +136,7 @@ if setuptools is not None:
+ # 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')
++ # install_requires.append('certifi')
+ if sys.version_info < (3, 5):
+ install_requires.append('backports_abc>=0.4')
+ kwargs['install_requires'] = install_requires
+diff --git a/tornado/netutil.py b/tornado/netutil.py
+index b7113d6..d5479ec 100644
+--- a/tornado/netutil.py
++++ b/tornado/netutil.py
+@@ -35,15 +35,6 @@ except ImportError:
+ # ssl is not available on Google App Engine
+ ssl = None
+
+-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
+-
+ if PY3:
+ xrange = range
+
+@@ -70,7 +61,7 @@ if hasattr(ssl, 'SSLContext'):
+ # 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.
+@@ -81,7 +72,7 @@ if hasattr(ssl, 'SSLContext'):
+ 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
+diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
+index 82f8686..ad49675 100644
+--- a/tornado/simple_httpclient.py
++++ b/tornado/simple_httpclient.py
+@@ -34,18 +34,8 @@ except ImportError:
+ # ssl is not available on Google App Engine.
+ ssl = None
+
+-try:
+- import certifi
+-except ImportError:
+- certifi = None
+-
+-
+ def _default_ca_certs():
+- if certifi is None:
+- raise Exception("The 'certifi' package is required to use https "
+- "in simple_httpclient")
+- return certifi.where()
+-
++ return '/etc/ssl/certs/ca-certificates.crt'
+
+ class SimpleAsyncHTTPClient(AsyncHTTPClient):
+ """Non-blocking HTTP client with no external dependencies.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-tornado.git
More information about the Python-modules-commits
mailing list