[Python-modules-commits] [python-werkzeug] 05/09: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Sat Apr 8 12:01:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-werkzeug.
commit c3eec518f682c92418f48ac3a4fd61b435b5a335
Merge: 304711c 968f728
Author: Ondřej Nový <onovy at debian.org>
Date: Sat Apr 8 13:24:53 2017 +0200
merge patched into master
.gitignore | 1 +
.travis.yml | 63 +++++---
AUTHORS | 6 +
CHANGES | 82 ++++++++--
CONTRIBUTING.rst | 8 +-
Makefile | 3 -
README.rst | 26 ++--
appveyor.yml | 18 +++
debian/.git-dpm | 6 +-
...opies-of-object.inv-for-building-document.patch | 6 +-
debian/patches/drop_ubuntu_font.patch | 4 +-
docs/_templates/sidebarintro.html | 2 +-
docs/changes.rst | 4 +-
docs/contrib/cache.rst | 2 +
docs/contrib/lint.rst | 2 +
docs/debug.rst | 5 +-
docs/exceptions.rst | 10 +-
docs/installation.rst | 2 +-
docs/local.rst | 2 +-
docs/serving.rst | 13 +-
docs/terms.rst | 4 +-
docs/tutorial.rst | 4 +-
docs/unicode.rst | 2 +-
examples/cupoftee/utils.py | 2 +-
scripts/make-release.py | 8 +-
setup.cfg | 7 +-
setup.py | 8 +-
tests/contrib/test_atom.py | 79 +++++++++-
tests/contrib/test_cache.py | 25 ++-
tests/hypothesis/__init__.py | 0
tests/hypothesis/test_urls.py | 33 ++++
tests/test_datastructures.py | 49 ++++++
tests/test_debug.py | 55 ++++++-
tests/test_exceptions.py | 12 +-
tests/test_formparser.py | 30 +++-
tests/test_http.py | 53 +++++++
tests/test_local.py | 24 +++
tests/test_routing.py | 58 ++++++-
tests/test_security.py | 81 +++++++---
tests/test_serving.py | 31 +++-
tests/test_test.py | 58 +++++++
tests/test_wrappers.py | 158 ++++++++++++++++++-
tests/test_wsgi.py | 55 +++++++
tox.ini | 37 +++--
werkzeug/__init__.py | 3 +-
werkzeug/_internal.py | 10 +-
werkzeug/contrib/atom.py | 2 +-
werkzeug/contrib/cache.py | 131 +++++++++++-----
werkzeug/contrib/fixers.py | 2 +-
werkzeug/contrib/iterio.py | 4 +-
werkzeug/contrib/lint.py | 6 +-
werkzeug/contrib/securecookie.py | 4 +-
werkzeug/contrib/sessions.py | 2 +-
werkzeug/contrib/wrappers.py | 2 +-
werkzeug/datastructures.py | 67 ++++++--
werkzeug/debug/__init__.py | 4 +-
werkzeug/debug/console.py | 2 +-
werkzeug/debug/repr.py | 9 +-
werkzeug/debug/shared/debugger.js | 2 +-
werkzeug/debug/shared/style.css | 3 +-
werkzeug/debug/tbtools.py | 4 +-
werkzeug/exceptions.py | 71 ++++++++-
werkzeug/formparser.py | 8 +-
werkzeug/http.py | 62 ++++++--
werkzeug/local.py | 12 +-
werkzeug/routing.py | 46 +++---
werkzeug/script.py | 18 ++-
werkzeug/security.py | 24 +--
werkzeug/serving.py | 54 +++++--
werkzeug/test.py | 33 ++--
werkzeug/useragents.py | 15 +-
werkzeug/wrappers.py | 168 ++++++++++++++++++---
werkzeug/wsgi.py | 111 +++++++++++++-
73 files changed, 1682 insertions(+), 335 deletions(-)
diff --cc debian/.git-dpm
index 0419259,0000000..ce6f515
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
- b08d6505830e166da703715d450782a5d627917b
- b08d6505830e166da703715d450782a5d627917b
- a369104063069f8c093872f8b6ce642a5e15cd41
++968f728ecc0d86f9146b697c6bc67a7b6a87e225
++968f728ecc0d86f9146b697c6bc67a7b6a87e225
++827d4435b27a2a55dc196b1957344ba1a15ac4f9
+827d4435b27a2a55dc196b1957344ba1a15ac4f9
+python-werkzeug_0.12.1+dfsg1.orig.tar.gz
+e99bc855d87eb67e3277dd81e38cde0ad618a4c8
+1098141
+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 2d5938f,0000000..375d780
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 b08d6505830e166da703715d450782a5d627917b Mon Sep 17 00:00:00 2001
++From 968f728ecc0d86f9146b697c6bc67a7b6a87e225 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 e2d4e0d..cbbbbb6 100644
++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://www.sqlalchemy.org/docs/05': 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 2d9eb72,0000000..663f29e
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 7b623e008862cd73652bd2d6b0787ada3dd64cfa Mon Sep 17 00:00:00 2001
++From f62f8be4f1b5bcf27e7a6621ce030054f2fd8c82 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 8833d01..6340a49 100644
++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