[Python-modules-commits] [raven] 05/06: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository raven.

commit 81f1f1cd421fe7ac5e4a0be17191fd5ef1dc7042
Merge: 1acb963 54dc57e
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue Feb 28 11:32:33 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-tests-import-reload-for-Python-3.patch    | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/transport/gevent/tests.py                    |  5 +++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 8aedc86,0000000..da69eb3
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
- fe509920c25ec8033dd060de3e9c8ba1e493dde4
- fe509920c25ec8033dd060de3e9c8ba1e493dde4
++54dc57ef750a08f2c804f3c9393bef88db16e5c1
++54dc57ef750a08f2c804f3c9393bef88db16e5c1
 +fe509920c25ec8033dd060de3e9c8ba1e493dde4
 +fe509920c25ec8033dd060de3e9c8ba1e493dde4
 +python-raven_6.0.0.orig.tar.xz
 +f8439bbc21ddf19d1dc789ad5c5e26cd1f5d5474
 +238840
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-tests-import-reload-for-Python-3.patch
index 0000000,0000000..20b4c16
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-tests-import-reload-for-Python-3.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 54dc57ef750a08f2c804f3c9393bef88db16e5c1 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Tue, 28 Feb 2017 11:32:14 +0100
++Subject: tests: import reload for Python 3
++
++---
++ tests/transport/gevent/tests.py | 5 +++++
++ 1 file changed, 5 insertions(+)
++
++diff --git a/tests/transport/gevent/tests.py b/tests/transport/gevent/tests.py
++index 22c3e9000661..ad667c18d449 100644
++--- a/tests/transport/gevent/tests.py
+++++ b/tests/transport/gevent/tests.py
++@@ -9,6 +9,11 @@ from raven.utils.testutils import TestCase
++ from raven.base import Client
++ from raven.transport.gevent import GeventedHTTPTransport
++ 
+++try:
+++    from importlib import reload
+++except ImportError:
+++    from imp import reload
+++
++ 
++ class GeventTransportTest(TestCase):
++     def setUp(self):
diff --cc debian/patches/series
index 0000000,0000000..e93f006
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-tests-import-reload-for-Python-3.patch

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