[Python-modules-commits] [python-urllib3] 02/15: merge patched into master

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository python-urllib3.

commit 670afd82681e3e37f920a6a1c17a2e88d85e70cb
Merge: 1a5991b 060f835
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Thu May 26 04:43:48 2016 +0200

    merge patched into master

 debian/.git-dpm                                 |  4 ++--
 debian/patches/0005-Use-system-python-six.patch | 22 ++++++++++++++++++++++
 debian/patches/series                           |  1 +
 urllib3/contrib/appengine.py                    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a5e25a1,0000000..600f852
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
- 206cc5a16d6495f633215528d538a4f2e94a2bf9
- 206cc5a16d6495f633215528d538a4f2e94a2bf9
++060f8357dc6094cda58daebf2de53b64d45de501
++060f8357dc6094cda58daebf2de53b64d45de501
 +9105037e3d018d407e6b6faad26ae5a8a17a732a
 +9105037e3d018d407e6b6faad26ae5a8a17a732a
 +python-urllib3_1.15.1.orig.tar.gz
 +a66d3db6d53d96c851316087406185d35555dcc4
 +169242
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Use-system-python-six.patch
index 0000000,0000000..47adc79
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Use-system-python-six.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 060f8357dc6094cda58daebf2de53b64d45de501 Mon Sep 17 00:00:00 2001
++From: Daniele Tricoli <eriol at mornie.org>
++Date: Thu, 26 May 2016 04:43:25 +0200
++Subject: Use system python-six
++
++---
++ urllib3/contrib/appengine.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/urllib3/contrib/appengine.py b/urllib3/contrib/appengine.py
++index f4289c0..5355244 100644
++--- a/urllib3/contrib/appengine.py
+++++ b/urllib3/contrib/appengine.py
++@@ -12,7 +12,7 @@ from ..exceptions import (
++     SSLError
++ )
++ 
++-from ..packages.six import BytesIO
+++from six import BytesIO
++ from ..request import RequestMethods
++ from ..response import HTTPResponse
++ from ..util.timeout import Timeout
diff --cc debian/patches/series
index 99e4db9,0000000..957c51c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +01_do-not-use-embedded-python-six.patch
 +02_require-cert-verification.patch
 +04_relax_nosetests_options.patch
 +05_avoid-embedded-ssl-match-hostname.patch
++0005-Use-system-python-six.patch

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