[Python-modules-commits] [flask-wtf] 04/08: merge patched into master
Adrian Vondendriesch
discostu-guest at moszumanska.debian.org
Fri Jun 2 08:30:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
discostu-guest pushed a commit to branch master
in repository flask-wtf.
commit d68e31ebace5813886be413ad7688a1af0d9afae
Merge: a89145e 97ca4f1
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date: Thu Jun 1 13:25:48 2017 +0200
merge patched into master
AUTHORS | 6 +
Flask_WTF.egg-info/PKG-INFO | 36 +-
Flask_WTF.egg-info/SOURCES.txt | 11 +-
Flask_WTF.egg-info/requires.txt | 1 -
LICENSE | 2 +-
MANIFEST.in | 12 +-
PKG-INFO | 36 +-
README.rst | 20 +-
debian/.git-dpm | 6 +-
... => 0001-Disable-test-that-uses-internet.patch} | 4 +-
debian/patches/doc-index.patch | 31 --
debian/patches/series | 3 +-
docs/Makefile | 170 ++++++++-
docs/_templates/useful-links.html | 6 +-
docs/_themes/README | 31 --
docs/_themes/README.rst | 71 ++++
docs/_themes/flask/layout.html | 47 +--
docs/_themes/flask/static/flasky.css_t | 24 +-
docs/_themes/flask/theme.conf | 2 +
docs/_themes/flask_small/layout.html | 38 ++
docs/_themes/flask_small/static/flasky.css_t | 287 +++++++++++++++
docs/_themes/{flask => flask_small}/theme.conf | 3 +
docs/api.rst | 50 +--
docs/changelog.rst | 117 +++++-
docs/conf.py | 322 +++++++++++-----
docs/config.rst | 80 ++--
docs/csrf.rst | 170 ++++-----
docs/form.rst | 128 ++++---
docs/index.rst | 22 +-
docs/install.rst | 2 +-
docs/make.bat | 394 ++++++++++++++------
docs/quickstart.rst | 9 +-
flask_wtf/__init__.py | 6 +-
flask_wtf/_compat.py | 16 +-
flask_wtf/csrf.py | 406 +++++++++++++--------
flask_wtf/file.py | 86 +++--
flask_wtf/form.py | 259 +++++++------
flask_wtf/html5.py | 9 +
flask_wtf/i18n.py | 5 +-
setup.cfg | 9 +
setup.py | 58 +--
test-requirements.txt | 5 +
tests/base.py | 54 ++-
tests/templates/csrf_macro.html | 2 +-
tests/test_csrf.py | 156 +++++---
tests/test_deprecated.py | 45 +++
tests/test_html5.py | 53 ---
tests/test_i18n.py | 6 +-
tests/test_recaptcha.py | 14 +-
tests/test_uploads.py | 14 +-
tests/test_validation.py | 75 ++--
tox.ini | 6 +
52 files changed, 2219 insertions(+), 1206 deletions(-)
diff --cc debian/.git-dpm
index 67c5aa9,0000000..5ce4263
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
- af02ee1fed68e6f68dd409ce7b67c481b458495b
- af02ee1fed68e6f68dd409ce7b67c481b458495b
- 1cd5df15057936b7f0cdecb47744163857753a8b
++97ca4f193494097d713a6309e162431fe3fef45c
++97ca4f193494097d713a6309e162431fe3fef45c
++66954889d8306a36a3a8f44745c48dc0e365345c
+66954889d8306a36a3a8f44745c48dc0e365345c
+flask-wtf_0.14.2.orig.tar.gz
+b8e8c9f2b76e43839b982b96683d2cfd70ac668f
+254903
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-test-that-uses-internet.patch
index e78d382,0000000..94c9e36
mode 100644,000000..100644
--- a/debian/patches/0001-Disable-test-that-uses-internet.patch
+++ b/debian/patches/0001-Disable-test-that-uses-internet.patch
@@@ -1,31 -1,0 +1,31 @@@
- From af02ee1fed68e6f68dd409ce7b67c481b458495b Mon Sep 17 00:00:00 2001
++From 97ca4f193494097d713a6309e162431fe3fef45c Mon Sep 17 00:00:00 2001
+From: Orestis Ioannou <orestis at oioannou.com>
+Date: Thu, 4 Feb 2016 00:15:37 +0100
+Subject: Disable test that uses internet
+
+---
+ tests/test_recaptcha.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_recaptcha.py b/tests/test_recaptcha.py
- index d752e0a..ba43c8f 100644
++index bd8c93a..d71c490 100644
+--- a/tests/test_recaptcha.py
++++ b/tests/test_recaptcha.py
+@@ -39,7 +39,7 @@ class TestRecaptcha(TestCase):
+ response = self.client.post('/', data={})
+ assert b'missing' in response.data
+
+- def test_send_recaptcha_request(self):
++ """def test_send_recaptcha_request(self):
+ response = self.client.post('/', data={
+ 'g-recaptcha-response': 'test'
+ })
+@@ -48,7 +48,7 @@ class TestRecaptcha(TestCase):
+ response = self.client.post('/', data=json.dumps({
+ 'g-recaptcha-response': 'test'
+ }), content_type='application/json')
+- assert b'invalid' in response.data
++ assert b'invalid' in response.data"""
+
+ def test_testing(self):
+ self.app.testing = True
diff --cc debian/patches/series
index 7fd4248,0000000..9960677
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- doc-index.patch
- 0002-Disable-test-that-uses-internet.patch
++0001-Disable-test-that-uses-internet.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flask-wtf.git
More information about the Python-modules-commits
mailing list