[Python-modules-commits] [python-webob] 04/05: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Thu Jan 19 15:35:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-webob.
commit 5b9a18b9348087dbe1dfd270f425a2d2aa585d55
Merge: 567d1c7 9412dff
Author: Ondřej Nový <onovy at debian.org>
Date: Thu Jan 19 16:30:14 2017 +0100
merge patched into master
.gitignore | 23 +-
.travis.yml | 11 +-
CHANGES.txt | 146 +--
HISTORY.txt | 51 -
PKG-INFO | 144 +--
README.rst | 4 +-
WebOb.egg-info/PKG-INFO | 144 +--
WebOb.egg-info/SOURCES.txt | 3 +-
WebOb.egg-info/requires.txt | 3 +-
appveyor.yml | 23 -
debian/.git-dpm | 6 +-
debian/patches/intersphinx-local.patch | 6 +-
docs/api/response.txt | 2 -
docs/conf.py | 2 -
docs/differences.txt | 5 +-
docs/index.txt | 116 +-
docs/reference.txt | 4 +-
docs/whatsnew-1.6.txt | 18 +-
docs/whatsnew-1.7.txt | 223 ----
setup.cfg | 2 +-
setup.py | 9 +-
tests/test_acceptparse.py | 21 +-
tests/test_byterange.py | 62 +-
tests/test_cachecontrol.py | 87 +-
tests/test_client_functional.py | 8 +-
tests/test_compat.py | 128 ---
tests/test_cookies.py | 381 +++----
tests/test_cookies_bw.py | 19 +-
tests/test_datetime_utils.py | 88 +-
tests/test_dec.py | 17 +-
tests/test_descriptors.py | 281 +++--
tests/test_etag.py | 98 +-
tests/test_etag_nose.py | 32 +-
tests/test_exc.py | 181 ++-
tests/test_headers.py | 66 +-
tests/test_in_wsgiref.py | 19 +-
tests/test_misc.py | 73 +-
tests/test_request.py | 1886 ++++++++++++++++----------------
tests/test_request_nose.py | 69 +-
tests/test_response.py | 857 ++++++---------
tests/test_static.py | 6 +-
tests/test_transcode.py | 42 +-
tox.ini | 28 +-
toxfast.ini | 10 +
webob/byterange.py | 2 +-
webob/compat.py | 33 +-
webob/dec.py | 12 +-
webob/descriptors.py | 5 +-
webob/exc.py | 29 +-
webob/headers.py | 11 +-
webob/request.py | 321 +++---
webob/response.py | 548 +++-------
webob/util.py | 4 +-
53 files changed, 2638 insertions(+), 3731 deletions(-)
diff --cc debian/.git-dpm
index 7c35f25,0000000..2822fa1
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
- 150691803b9e251697ac6dfae72a668e1261a480
- 150691803b9e251697ac6dfae72a668e1261a480
- a27a91a5b4549cd1949e67d7b056ce4fd1739e48
++9412dffb672f34a1e8ca63e9cbe187309c58d6f8
++9412dffb672f34a1e8ca63e9cbe187309c58d6f8
++ca1cbb0344ec617543a07386ff7e72aba3923300
+ca1cbb0344ec617543a07386ff7e72aba3923300
+python-webob_1.6.2.orig.tar.gz
+4e59f44f5e295f0302281008afe95841c641de22
+205228
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx-local.patch
index da17773,0000000..cfaf0a4
mode 100644,000000..100644
--- a/debian/patches/intersphinx-local.patch
+++ b/debian/patches/intersphinx-local.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 150691803b9e251697ac6dfae72a668e1261a480 Mon Sep 17 00:00:00 2001
++From 9412dffb672f34a1e8ca63e9cbe187309c58d6f8 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at python.org>
+Date: Tue, 12 Jul 2016 11:00:18 -0400
+Subject: Use local python{,3}-doc for intersphinx.
+
+Patch-Name: intersphinx-local.patch
+---
+ docs/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index bfc7d1a..76c0b6f 100644
++index 321769e..8f49873 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -152,6 +152,6 @@ epub_exclude_files = ['search.html']
++@@ -150,6 +150,6 @@ epub_exclude_files = ['search.html']
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+ intersphinx_mapping = {
+- 'python': ('https://docs.python.org', None),
+- 'python3': ('https://docs.python.org/3', None),
++ 'python': ('/usr/share/doc/python-doc/html', None),
++ 'python3': ('/usr/share/doc/python3-doc/html', None),
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-webob.git
More information about the Python-modules-commits
mailing list