[Python-modules-commits] [python-urllib3] 09/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 93be89679482573000fa975c24abcc2842f939ca
Merge: c6b3fd2 ab3089d
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Thu May 26 04:57:22 2016 +0200

    merge patched into master

 debian/.git-dpm                                 |  4 +-
 debian/patches/0005-Use-system-python-six.patch | 50 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 test/with_dummyserver/test_chunked_transfer.py  |  2 +-
 test/with_dummyserver/test_connectionpool.py    |  2 +-
 test/with_dummyserver/test_https.py             |  2 +-
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index a8db693,0000000..114a489
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
- fa124290654ef4cc91a15187d455bac490f3c3d4
- fa124290654ef4cc91a15187d455bac490f3c3d4
++ab3089d49c5611ecfc48d876fc2fc15938bb57e2
++ab3089d49c5611ecfc48d876fc2fc15938bb57e2
 +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..fc62861
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Use-system-python-six.patch
@@@ -1,0 -1,0 +1,50 @@@
++From ab3089d49c5611ecfc48d876fc2fc15938bb57e2 Mon Sep 17 00:00:00 2001
++From: Daniele Tricoli <eriol at mornie.org>
++Date: Thu, 26 May 2016 04:56:55 +0200
++Subject: Use system python-six
++
++---
++ test/with_dummyserver/test_chunked_transfer.py | 2 +-
++ test/with_dummyserver/test_connectionpool.py   | 2 +-
++ test/with_dummyserver/test_https.py            | 2 +-
++ 3 files changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/test/with_dummyserver/test_chunked_transfer.py b/test/with_dummyserver/test_chunked_transfer.py
++index 1d58e23..abfc777 100644
++--- a/test/with_dummyserver/test_chunked_transfer.py
+++++ b/test/with_dummyserver/test_chunked_transfer.py
++@@ -1,7 +1,7 @@
++ # -*- coding: utf-8 -*-
++ 
++ from urllib3 import HTTPConnectionPool
++-from urllib3.packages import six
+++import six
++ from dummyserver.testcase import SocketDummyServerTestCase
++ 
++ 
++diff --git a/test/with_dummyserver/test_connectionpool.py b/test/with_dummyserver/test_connectionpool.py
++index 0f31fa0..b3b72ca 100644
++--- a/test/with_dummyserver/test_connectionpool.py
+++++ b/test/with_dummyserver/test_connectionpool.py
++@@ -31,7 +31,7 @@ from urllib3.exceptions import (
++     ProtocolError,
++     NewConnectionError,
++ )
++-from urllib3.packages.six import b, u
+++from six import b, u
++ from urllib3.util.retry import Retry
++ from urllib3.util.timeout import Timeout
++ 
++diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py
++index 2c5f035..be54e3c 100644
++--- a/test/with_dummyserver/test_https.py
+++++ b/test/with_dummyserver/test_https.py
++@@ -36,7 +36,7 @@ from urllib3.exceptions import (
++     SystemTimeWarning,
++     InsecurePlatformWarning,
++ )
++-from urllib3.packages import six
+++import six
++ from urllib3.util.timeout import Timeout
++ import urllib3.util as util
++ 
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