[Python-modules-commits] [flask] 02/05: 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.

commit 82ca87101d82699562a034b6c281182df383e1df
Merge: f38c407 130485c
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Jul 9 18:29:03 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-Added-Python-3.6-support-for-tests.patch  | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_basic.py                                |  2 +-
 tests/test_ext.py                                  |  4 +--
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 84eb840,0000000..99d9837
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
- c8fb21caab67574be1cbd928816068c1a156078f
- c8fb21caab67574be1cbd928816068c1a156078f
++130485c6780fd28275ef5716e7effa8cb4b1561b
++130485c6780fd28275ef5716e7effa8cb4b1561b
 +846a463e9be7e6e5bfb1fabbed465308171aca54
 +846a463e9be7e6e5bfb1fabbed465308171aca54
 +flask_0.12.2.orig.tar.gz
 +8193757ded6a4f0e7c9a3ce291bf3ae3a1d402c5
 +548510
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Added-Python-3.6-support-for-tests.patch
index 0000000,0000000..fcea228
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Added-Python-3.6-support-for-tests.patch
@@@ -1,0 -1,0 +1,39 @@@
++From 130485c6780fd28275ef5716e7effa8cb4b1561b Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 9 Jul 2017 18:28:31 +0200
++Subject: Added Python 3.6 support for tests
++
++Author: Andrew Arendt <AndrewArendt at gmail.com>
++---
++ tests/test_basic.py | 2 +-
++ tests/test_ext.py   | 4 ++--
++ 2 files changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/tests/test_basic.py b/tests/test_basic.py
++index c5ec9f5..7441d1b 100644
++--- a/tests/test_basic.py
+++++ b/tests/test_basic.py
++@@ -333,7 +333,7 @@ def test_session_expiration():
++     client = app.test_client()
++     rv = client.get('/')
++     assert 'set-cookie' in rv.headers
++-    match = re.search(r'\bexpires=([^;]+)(?i)', rv.headers['set-cookie'])
+++    match = re.search(r'(?i)\bexpires=([^;]+)', rv.headers['set-cookie'])
++     expires = parse_date(match.group())
++     expected = datetime.utcnow() + app.permanent_session_lifetime
++     assert expires.year == expected.year
++diff --git a/tests/test_ext.py b/tests/test_ext.py
++index d336e40..ebb5f02 100644
++--- a/tests/test_ext.py
+++++ b/tests/test_ext.py
++@@ -179,8 +179,8 @@ def test_flaskext_broken_package_no_module_caching(flaskext_broken):
++ def test_no_error_swallowing(flaskext_broken):
++     with pytest.raises(ImportError) as excinfo:
++         import flask.ext.broken
++-
++-    assert excinfo.type is ImportError
+++    # python3.6 raises a subclass of ImportError: 'ModuleNotFoundError'
+++    assert issubclass(excinfo.type, ImportError)
++     if PY2:
++         message = 'No module named missing_module'
++     else:
diff --cc debian/patches/series
index 53be40d,0000000..b5c98bc
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch
++0002-Added-Python-3.6-support-for-tests.patch

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