[Python-modules-commits] [python-werkzeug] 05/07: merge patched into master
Ondrej Novy
onovy at debian.org
Mon Jan 8 16:46:17 UTC 2018
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-werkzeug.
commit 4714a12d7c58822f0d25009e910a66a706ab1807
Merge: 5f150d1 3244541
Author: Ondřej Nový <onovy at debian.org>
Date: Mon Jan 8 17:13:32 2018 +0100
merge patched into master
AUTHORS | 37 +++-
CHANGES.rst | 54 ++++-
debian/.git-dpm | 6 +-
...opies-of-object.inv-for-building-document.patch | 2 +-
debian/patches/drop_ubuntu_font.patch | 2 +-
docs/middlewares.rst | 2 +
docs/tutorial.rst | 4 +-
setup.cfg | 1 +
tests/__init__.py | 4 +-
tests/conftest.py | 22 +-
tests/contrib/cache/test_cache.py | 55 ++++-
tests/contrib/{cache => }/test_cache.py | 235 ++++++++++-----------
tests/test_datastructures.py | 46 +++-
tests/test_http.py | 25 +++
tests/test_routing.py | 22 ++
tests/test_security.py | 3 +-
tests/test_serving.py | 59 +++++-
tests/test_test.py | 13 ++
tests/test_wrappers.py | 101 ++++++++-
tests/test_wsgi.py | 49 +++++
werkzeug/__init__.py | 2 +-
werkzeug/_internal.py | 25 +--
werkzeug/_reloader.py | 58 ++---
werkzeug/contrib/cache.py | 87 ++++++--
werkzeug/datastructures.py | 68 ++++--
werkzeug/debug/__init__.py | 6 +-
werkzeug/formparser.py | 23 +-
werkzeug/http.py | 21 +-
werkzeug/routing.py | 28 ++-
werkzeug/serving.py | 23 +-
werkzeug/test.py | 51 ++++-
werkzeug/useragents.py | 3 +-
werkzeug/wrappers.py | 43 ++--
werkzeug/wsgi.py | 161 +++++++++++++-
34 files changed, 1062 insertions(+), 279 deletions(-)
diff --cc debian/.git-dpm
index 7b8e06a,0000000..1198bf7
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
- c06cb887d50eb0fbb441fee53d26be468458c01b
- c06cb887d50eb0fbb441fee53d26be468458c01b
- f4ecffb3d80d15dc5c2a7b58c10e994abac6b0a4
++3244541cc82e4a7c5e4213f22a7a85abe4fd29f8
++3244541cc82e4a7c5e4213f22a7a85abe4fd29f8
++d604d9b2e4b9ebb7720d6f8b6fa397624dc2f3ff
+d604d9b2e4b9ebb7720d6f8b6fa397624dc2f3ff
+python-werkzeug_0.14.1+dfsg1.orig.tar.gz
+c1e1525608134964708afafb6c559e5314be3fe9
+1109469
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
index 9784730,0000000..9796522
mode 100644,000000..100644
--- a/debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
+++ b/debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
@@@ -1,21 -1,0 +1,21 @@@
- From c06cb887d50eb0fbb441fee53d26be468458c01b Mon Sep 17 00:00:00 2001
++From 3244541cc82e4a7c5e4213f22a7a85abe4fd29f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
+Date: Mon, 11 Jul 2016 07:11:44 +0200
+Subject: Use local copies of object.inv for building documentation
+
+---
+ docs/conf.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 540ae20..cbbbbb6 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -209,6 +209,5 @@ latex_use_modindex = False
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+ intersphinx_mapping = {
+- 'http://docs.python.org/dev': None,
+- 'http://docs.sqlalchemy.org/en/latest/': None
++ 'py': ('/usr/share/doc/python-doc/html', None),
+ }
diff --cc debian/patches/drop_ubuntu_font.patch
index c674fc7,0000000..66a0adb
mode 100644,000000..100644
--- a/debian/patches/drop_ubuntu_font.patch
+++ b/debian/patches/drop_ubuntu_font.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 04b3e7f9ca07eaa05e33e454b02766001301c155 Mon Sep 17 00:00:00 2001
++From fadbc1bd539a76edc4e576d00d218d1b4793a933 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:25:38 -0700
+Subject: drop_ubuntu_font
+
+Patch-Name: drop_ubuntu_font.patch
+---
+ werkzeug/debug/shared/style.css | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/werkzeug/debug/shared/style.css b/werkzeug/debug/shared/style.css
+index 2f4c5be..4e9fbe2 100644
+--- a/werkzeug/debug/shared/style.css
++++ b/werkzeug/debug/shared/style.css
+@@ -1,9 +1,7 @@
+ @font-face {
+- font-family: 'Ubuntu';
++ font-family: 'Ubuntu', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana';
+ font-style: normal;
+ font-weight: normal;
+- src: local('Ubuntu'), local('Ubuntu-Regular'),
+- url('?__debugger__=yes&cmd=resource&f=ubuntu.ttf') format('truetype');
+ }
+
+ body, input { font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-werkzeug.git
More information about the Python-modules-commits
mailing list