[Python-modules-commits] [cherrypy3] 07/08: merge patched into master
Carl Suster
arcresu-guest at moszumanska.debian.org
Thu Jan 12 07:35:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
arcresu-guest pushed a commit to branch master
in repository cherrypy3.
commit d67dd98b7529b0dec946a9abb4c7d5cc31de9b68
Merge: b61f812 09b76eb
Author: Carl Suster <carl at contraflo.ws>
Date: Thu Jan 12 18:00:16 2017 +1100
merge patched into master
CHANGES.rst | 5 +++++
CherryPy.egg-info/PKG-INFO | 7 +++++--
CherryPy.egg-info/SOURCES.txt | 3 ++-
PKG-INFO | 7 +++++--
README.rst | 5 ++++-
appveyor.yml | 19 +++++++++++++++++++
cherrypy/test/test_core.py | 6 +++++-
cherrypy/test/test_static.py | 8 ++++++--
cherrypy/test/test_wsgi_unix_socket.py | 22 +++-------------------
cherrypy/test/webtest.py | 2 +-
cherrypy/tutorial/README.rst | 16 ++++++++++++++++
cherrypy/tutorial/README.txt | 15 ---------------
cherrypy/wsgiserver/__init__.py | 2 +-
debian/.git-dpm | 6 +++---
.../0001-disable-sphinx-rst.linker-extension.patch | 2 +-
...02-use-mock.mock-instead-of-unittest.mock.patch | 2 +-
.../patches/0003-disable-test_antistampede.patch | 2 +-
.../0004-unrepr-also-from-__builtin__.patch | 2 +-
setup.cfg | 2 +-
19 files changed, 80 insertions(+), 53 deletions(-)
diff --cc debian/.git-dpm
index bfba407,0000000..70a3834
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
- 91a87a35e9769919192463c5f7b46cb211b5b9e1
- 91a87a35e9769919192463c5f7b46cb211b5b9e1
- 19b5509b39bed64544a4d901e6751e90a6da93a7
++09b76eb0d3b9f1544bb5d6f57d91a715585ae918
++09b76eb0d3b9f1544bb5d6f57d91a715585ae918
++fa7140228740b12dd04d7b4ed2e76ad92cb43640
+fa7140228740b12dd04d7b4ed2e76ad92cb43640
+cherrypy3_8.8.0.orig.tar.gz
+6119e433e4d9283fab00f75e9f59b698b760019f
+713247
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable-sphinx-rst.linker-extension.patch
index fa326a5,0000000..fa12fd4
mode 100644,000000..100644
--- a/debian/patches/0001-disable-sphinx-rst.linker-extension.patch
+++ b/debian/patches/0001-disable-sphinx-rst.linker-extension.patch
@@@ -1,22 -1,0 +1,22 @@@
- From e9a714cb7fa6d404e52184da408a67348304fc4d Mon Sep 17 00:00:00 2001
++From 056a32618b385e9572995f79bf269e0e36767908 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Wed, 4 Jan 2017 16:34:49 +1100
+Subject: disable sphinx rst.linker extension
+
+This is not yet packaged in Debian and is harmless to ignore for now.
+---
+ docs/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index b14e42a..ff883b2 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -38,7 +38,6 @@ extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.todo',
+ 'sphinx.ext.intersphinx',
+- 'rst.linker',
+ ]
+
+ intersphinx_mapping = {
diff --cc debian/patches/0002-use-mock.mock-instead-of-unittest.mock.patch
index ff2ac92,0000000..401a82c
mode 100644,000000..100644
--- a/debian/patches/0002-use-mock.mock-instead-of-unittest.mock.patch
+++ b/debian/patches/0002-use-mock.mock-instead-of-unittest.mock.patch
@@@ -1,51 -1,0 +1,51 @@@
- From 881b9078e3c3724d1565a22750402bf586759084 Mon Sep 17 00:00:00 2001
++From a4c6395e84750b9996483b23cf0dead2995ab7cd Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Wed, 4 Jan 2017 17:33:16 +1100
+Subject: use mock.mock instead of unittest.mock
+
+Upstream uses backports.unittest_mock. Instead, we use python*-mock
+which is available in Debian and does the same job of backporting Python
+3's unittest mock other than calling it mock.mock instead. This patch
+just switches to this import statement in the test suite.
+---
+ cherrypy/test/test_encoding.py | 2 +-
+ cherrypy/test/test_http.py | 2 +-
+ cherrypy/wsgiserver/test_wsgiserver.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cherrypy/test/test_encoding.py b/cherrypy/test/test_encoding.py
+index 93778da..197c224 100644
+--- a/cherrypy/test/test_encoding.py
++++ b/cherrypy/test/test_encoding.py
+@@ -2,7 +2,7 @@
+
+ import gzip
+ import io
+-from unittest import mock
++from mock import mock
+
+ import six
+
+diff --git a/cherrypy/test/test_http.py b/cherrypy/test/test_http.py
+index 8cba5a1..a8bd0a3 100644
+--- a/cherrypy/test/test_http.py
++++ b/cherrypy/test/test_http.py
+@@ -4,7 +4,7 @@ import errno
+ import mimetypes
+ import socket
+ import sys
+-from unittest import mock
++from mock import mock
+
+ import six
+
+diff --git a/cherrypy/wsgiserver/test_wsgiserver.py b/cherrypy/wsgiserver/test_wsgiserver.py
+index b1b6741..3fe2b1f 100644
+--- a/cherrypy/wsgiserver/test_wsgiserver.py
++++ b/cherrypy/wsgiserver/test_wsgiserver.py
+@@ -1,4 +1,4 @@
+-from unittest import mock
++from mock import mock
+
+ import six
+
diff --cc debian/patches/0003-disable-test_antistampede.patch
index 089c1be,0000000..85ea2f3
mode 100644,000000..100644
--- a/debian/patches/0003-disable-test_antistampede.patch
+++ b/debian/patches/0003-disable-test_antistampede.patch
@@@ -1,31 -1,0 +1,31 @@@
- From 80acc3353981e75c784c5b017da6b35355d33643 Mon Sep 17 00:00:00 2001
++From 5ab452085331ad130ae659633c8dcafc12325e1f Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Fri, 6 Jan 2017 19:44:00 +1100
+Subject: disable test_antistampede
+
+This test spawns many threads that all make a request to an endpoint in
+the web server which does nothing but sleep and return a string. The
+idea is that if caching works this is very fast, so the test assertion
+is that the test was completed quickly.
+
+If the test fails it could run for quite a while, and there is a known
+problem upstream which makes this test unreliable which is why it is
+marked as allowed to fail for pytest. To speed things up, we disable it
+completely until it works more reliably.
+---
+ cherrypy/test/test_caching.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cherrypy/test/test_caching.py b/cherrypy/test/test_caching.py
+index fa2b8cb..1e95341 100644
+--- a/cherrypy/test/test_caching.py
++++ b/cherrypy/test/test_caching.py
+@@ -292,7 +292,7 @@ class CacheTest(helper.CPWebCase):
+ self.assertHeader('Age')
+
+ @pytest.mark.xfail(reason='#1536')
+- def test_antistampede(self):
++ def disabled_test_antistampede(self):
+ SECONDS = 4
+ slow_url = '/long_process?seconds={SECONDS}'.format(**locals())
+ # We MUST make an initial synchronous request in order to create the
diff --cc debian/patches/0004-unrepr-also-from-__builtin__.patch
index 9387663,0000000..a7da41d
mode 100644,000000..100644
--- a/debian/patches/0004-unrepr-also-from-__builtin__.patch
+++ b/debian/patches/0004-unrepr-also-from-__builtin__.patch
@@@ -1,45 -1,0 +1,45 @@@
- From 91a87a35e9769919192463c5f7b46cb211b5b9e1 Mon Sep 17 00:00:00 2001
++From 09b76eb0d3b9f1544bb5d6f57d91a715585ae918 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Fri, 6 Jan 2017 20:21:51 +1100
+Subject: unrepr also from __builtin__
+
+The Python2 tests are failing because __import__ is not found either as
+a module or inside the module "builtins". According to the docs at
+https://docs.python.org/2/library/functions.html#__import__ this
+function is instead inside the module "__builtin__".
+
+This patch makes unrepr also look for the name inside __builtin__ so
+that it can find __import__. It is not clear why this works upstream but
+not in Debian.
+---
+ cherrypy/lib/reprconf.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/cherrypy/lib/reprconf.py b/cherrypy/lib/reprconf.py
+index 2553292..0e380b5 100644
+--- a/cherrypy/lib/reprconf.py
++++ b/cherrypy/lib/reprconf.py
+@@ -321,6 +321,11 @@ class _Builder2:
+ return getattr(builtins, name)
+ except AttributeError:
+ pass
++ try:
++ import __builtin__
++ return getattr(__builtin__, name)
++ except AttributeError:
++ pass
+
+ raise TypeError('unrepr could not resolve the name %s' % repr(name))
+
+@@ -465,6 +470,11 @@ class _Builder3:
+ return getattr(builtins, name)
+ except AttributeError:
+ pass
++ try:
++ import __builtin__
++ return getattr(__builtin__, name)
++ except AttributeError:
++ pass
+
+ raise TypeError('unrepr could not resolve the name %s' % repr(name))
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cherrypy3.git
More information about the Python-modules-commits
mailing list