[Python-modules-commits] [flask-restful] 05/12: merge patched into master

[Ondřej Nový]

This is an automated email from the git hooks/post-receive script.

onovy pushed a commit to branch master
in repository flask-restful.

commit 921e19e546a22e0d659dc7fbb1c53c1098189215
Merge: 5b1939d 81b0b8d
Author: Ondřej Nový <onovy at debian.org>
Date:   Sat Aug 13 23:24:22 2016 +0200

    merge patched into master

 .travis.yml                          |  1 +
 AUTHORS.md                           | 14 +++++++++
 CHANGES.md                           | 14 +++++++++
 Makefile                             |  4 ++-
 debian/.git-dpm                      |  6 ++--
 debian/patches/remove-external-image |  2 +-
 debian/patches/skip-bad-test         |  6 ++--
 docs/conf.py                         |  1 +
 docs/extending.rst                   | 16 ++++++++++
 docs/fields.rst                      |  7 +++++
 docs/intermediate-usage.rst          |  4 +--
 docs/quickstart.rst                  |  4 +--
 docs/reqparse.rst                    | 59 +++++++++++++++++++++++++++++++++++-
 flask_restful/__init__.py            | 34 ++++++++++++---------
 flask_restful/fields.py              |  8 ++---
 flask_restful/inputs.py              |  8 ++---
 flask_restful/reqparse.py            | 23 +++++++++-----
 setup.py                             |  5 ++-
 tests/test_accept.py                 | 27 ++++++++++++++---
 tests/test_api.py                    | 53 ++++++++++++++++++++++++++++++--
 tests/test_reqparse.py               | 23 +++++++++++---
 21 files changed, 264 insertions(+), 55 deletions(-)

diff --cc debian/.git-dpm
index ed55de6,0000000..01d9feb
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
- 79132a69e79456e57afcd2c16fd1cc52c722e112
- 79132a69e79456e57afcd2c16fd1cc52c722e112
- 168bc2c731d3fb91e15fd3f3658db16d19ef8075
++81b0b8d57544dcab9fa1a5e0ac3dc81a2ac4f231
++81b0b8d57544dcab9fa1a5e0ac3dc81a2ac4f231
++90839985ac22066b03cf26576bf553460c71124e
 +90839985ac22066b03cf26576bf553460c71124e
 +flask-restful_0.3.5.orig.tar.gz
 +c701a0a8902557bf51c71c765b9b6b9ec5edaf4e
 +113214
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-external-image
index 440c6ec,0000000..f942e98
mode 100644,000000..100644
--- a/debian/patches/remove-external-image
+++ b/debian/patches/remove-external-image
@@@ -1,28 -1,0 +1,28 @@@
- From 79132a69e79456e57afcd2c16fd1cc52c722e112 Mon Sep 17 00:00:00 2001
++From 81b0b8d57544dcab9fa1a5e0ac3dc81a2ac4f231 Mon Sep 17 00:00:00 2001
 +From: Jonathan Carter <jonathan at ubuntu.com>
 +Date: Sat, 2 Jan 2016 18:07:23 +0200
 +Subject: remove externally linked image
 +
 +Remove an externally linked image that could cause a potential privacy
 +violation.
 +
 +Patch-Name: remove-external-image
 +---
 + docs/_themes/flask_small/layout.html | 2 ++
 + 1 file changed, 2 insertions(+)
 +
 +diff --git a/docs/_themes/flask_small/layout.html b/docs/_themes/flask_small/layout.html
 +index aa1716a..4373a0f 100644
 +--- a/docs/_themes/flask_small/layout.html
 ++++ b/docs/_themes/flask_small/layout.html
 +@@ -14,8 +14,10 @@
 + {% block relbar1 %}{% endblock %}
 + {% block relbar2 %}
 +   {% if theme_github_fork %}
 ++    <!--
 +     <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
 +     src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
 ++    -->
 +   {% endif %}
 + {% endblock %}
 + {% block sidebar1 %}{% endblock %}
diff --cc debian/patches/skip-bad-test
index b21bb32,0000000..de86475
mode 100644,000000..100644
--- a/debian/patches/skip-bad-test
+++ b/debian/patches/skip-bad-test
@@@ -1,45 -1,0 +1,45 @@@
- From 2ee87be10622f58361ec0993a48cd6ea531e280f Mon Sep 17 00:00:00 2001
++From 482e4504c5292ac220b715247f144ea7eac5c70e Mon Sep 17 00:00:00 2001
 +From: Jonathan Carter <jonathan at ubuntu.com>
 +Date: Sat, 2 Jan 2016 18:06:26 +0200
 +Subject: skip test that is broken
 +
 +test_accept_no_default_match_q0_not_acceptable will fail until Werkzeug
 +version 1.0 is released. Until then, this test is disabled.
 +
 +Bug-Debian: https://bugs.debian.org/763962
 +Patch-Name: skip-bad-test
 +---
 + tests/test_accept.py | 20 --------------------
 + 1 file changed, 20 deletions(-)
 +
 +diff --git a/tests/test_accept.py b/tests/test_accept.py
- index 7d78118..1f294e9 100644
++index 6eb3416..730f868 100644
 +--- a/tests/test_accept.py
 ++++ b/tests/test_accept.py
- @@ -121,26 +121,6 @@ class AcceptTestCase(unittest.TestCase):
++@@ -144,26 +144,6 @@ class AcceptTestCase(unittest.TestCase):
 +             assert_equals(res.content_type, 'text/plain')
 + 
 + 
 +-    def test_accept_no_default_match_q0_not_acceptable(self):
 +-        """
 +-        q=0 should be considered NotAcceptable,
 +-        but this depends on werkzeug >= 1.0 which is not yet released
 +-        so this test is expected to fail until we depend on werkzeug >= 1.0
 +-        """
 +-        class Foo(flask_restful.Resource):
 +-            def get(self):
 +-                return "data"
 +-
 +-        app = Flask(__name__)
 +-        api = flask_restful.Api(app, default_mediatype=None)
 +-
 +-        api.add_resource(Foo, '/')
 +-
 +-        with app.test_client() as client:
 +-            res = client.get('/', headers=[('Accept', 'application/json; q=0')])
 +-            assert_equals(res.status_code, 406)
 +-            assert_equals(res.content_type, 'application/json')
 +-
 +     def test_accept_no_default_accept_highest_quality_of_two(self):
 +         class Foo(flask_restful.Resource):
 +             def get(self):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flask-restful.git