[Python-modules-commits] [python-werkzeug] 04/15: merge patched into master
Ondřej Nový
onovy-guest at moszumanska.debian.org
Sun May 1 13:31:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy-guest pushed a commit to branch master
in repository python-werkzeug.
commit b47d91f1d03871cce0486f53e5dcc4bd9b44bd10
Merge: 33c73cb 8d81a77
Author: Ondřej Nový <novy at ondrej.org>
Date: Sun May 1 12:32:19 2016 +0200
merge patched into master
.gitignore | 17 ++
.travis.yml | 42 +++
CHANGES | 139 ++++++++++
CONTRIBUTING.rst | 62 +++++
Makefile | 3 +
PKG-INFO | 72 -----
README.rst | 17 +-
bench/wzbench.py | 461 ++++++++++++++++++++++++++++++++
debian/.git-dpm | 6 +-
debian/patches/drop_ubuntu_font.patch | 4 +-
docs/_themes/werkzeug_theme_support.pyc | Bin 2468 -> 0 bytes
docs/contents.rst.inc | 1 +
docs/debug.rst | 28 +-
docs/exceptions.rst | 10 +-
docs/filesystem.rst | 11 +
docs/local.rst | 23 +-
docs/middlewares.rst | 2 +-
docs/python3.rst | 5 +-
docs/request_data.rst | 2 +-
docs/unicode.rst | 22 ++
examples/cupoftee/pages.py | 2 +-
scripts/make-release.py | 153 +++++++++++
setup.cfg | 11 +-
setup.py | 18 +-
tests/__init__.py | 2 -
tests/contrib/test_atom.py | 1 +
tests/contrib/test_cache.py | 45 +++-
tests/contrib/test_fixers.py | 27 +-
tests/contrib/test_iterio.py | 2 +-
tests/contrib/test_securecookie.py | 1 +
tests/contrib/test_sessions.py | 5 +-
tests/contrib/test_wrappers.py | 4 +-
tests/test_compat.py | 11 +-
tests/test_datastructures.py | 19 +-
tests/test_debug.py | 13 +-
tests/test_exceptions.py | 1 +
tests/test_formparser.py | 41 ++-
tests/test_http.py | 76 ++++--
tests/test_internal.py | 2 +
tests/test_local.py | 35 ++-
tests/test_routing.py | 224 ++++++++++++----
tests/test_security.py | 10 +-
tests/test_serving.py | 53 ++++
tests/test_test.py | 68 ++++-
tests/test_urls.py | 48 ++--
tests/test_utils.py | 64 ++++-
tests/test_wrappers.py | 115 ++++++--
tests/test_wsgi.py | 31 ++-
tox.ini | 31 +++
werkzeug-import-rewrite.py | 230 ++++++++++++++++
werkzeug/__init__.py | 114 ++++----
werkzeug/_compat.py | 36 +--
werkzeug/_internal.py | 18 +-
werkzeug/_reloader.py | 37 ++-
werkzeug/contrib/atom.py | 14 +-
werkzeug/contrib/cache.py | 165 +++++++++---
werkzeug/contrib/fixers.py | 10 +-
werkzeug/contrib/iterio.py | 3 +
werkzeug/contrib/limiter.py | 1 +
werkzeug/contrib/lint.py | 19 +-
werkzeug/contrib/profiler.py | 19 +-
werkzeug/contrib/securecookie.py | 4 +-
werkzeug/contrib/sessions.py | 18 +-
werkzeug/contrib/testtools.py | 4 +-
werkzeug/contrib/wrappers.py | 6 +
werkzeug/datastructures.py | 98 +++++--
werkzeug/debug/__init__.py | 322 ++++++++++++++++++++--
werkzeug/debug/console.py | 6 +-
werkzeug/debug/repr.py | 7 +-
werkzeug/debug/shared/debugger.js | 110 ++++----
werkzeug/debug/shared/style.css | 59 ++--
werkzeug/debug/tbtools.py | 90 +++++--
werkzeug/exceptions.py | 43 ++-
werkzeug/filesystem.py | 66 +++++
werkzeug/formparser.py | 10 +-
werkzeug/http.py | 102 ++++---
werkzeug/local.py | 13 +-
werkzeug/posixemulation.py | 10 +-
werkzeug/routing.py | 139 ++++++++--
werkzeug/script.py | 3 +-
werkzeug/security.py | 3 +-
werkzeug/serving.py | 145 +++++++---
werkzeug/test.py | 26 +-
werkzeug/testapp.py | 6 +-
werkzeug/urls.py | 27 +-
werkzeug/useragents.py | 8 +-
werkzeug/utils.py | 46 ++--
werkzeug/wrappers.py | 97 ++++---
werkzeug/wsgi.py | 32 ++-
89 files changed, 3378 insertions(+), 828 deletions(-)
diff --cc debian/.git-dpm
index 77ff2ac,0000000..84a998f
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
- 4b15261d20b1d541f82b6ee57dd46dfcd245d3dc
- 4b15261d20b1d541f82b6ee57dd46dfcd245d3dc
- e8c7062017523d5cb4cea9947296200d39f9295d
++8d81a77e2700129548d236e0d43cd399b52822d9
++8d81a77e2700129548d236e0d43cd399b52822d9
++f888071666bddf458ff403c23cb41a508d74b44d
+f888071666bddf458ff403c23cb41a508d74b44d
+python-werkzeug_0.11.9+dfsg1.orig.tar.gz
+3d9e38a0e142b497a49ab4b13b0dd44b2b8e0e85
+1083902
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/drop_ubuntu_font.patch
index 32970cd,0000000..508ea6a
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 4b15261d20b1d541f82b6ee57dd46dfcd245d3dc Mon Sep 17 00:00:00 2001
++From 8d81a77e2700129548d236e0d43cd399b52822d9 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 53a107e..5c6c9c4 100644
++index 8833d01..6340a49 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