[Python-modules-commits] [python-pip] 10/17: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-pip.

commit b4d6deb4308b0b926f2521c56ad8e102b8090d0b
Merge: 206ab7d 4531a2e
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jun 17 10:11:45 2016 +0300

    merge patched into master

 debian/.git-dpm                            |  4 ++--
 debian/patches/ignore-socks-warnings.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 pip/__init__.py                            |  9 +++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index e93345f,0000000..1960dc5
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
- bf0262170b9b02149d5e8d3266bd1e86b03b5650
- bf0262170b9b02149d5e8d3266bd1e86b03b5650
++4531a2e3bea39a2cff9dc0bba5a20886f620379c
++4531a2e3bea39a2cff9dc0bba5a20886f620379c
 +030df74bb06ecef9a308cb8315a0c93f1f971cfb
 +030df74bb06ecef9a308cb8315a0c93f1f971cfb
 +python-pip_8.1.2.orig.tar.gz
 +1c13c247967ec5bee6de5fd104c5d78ba30951c7
 +1140573
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/ignore-socks-warnings.patch
index 0000000,0000000..305404a
new file mode 100644
--- /dev/null
+++ b/debian/patches/ignore-socks-warnings.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 4531a2e3bea39a2cff9dc0bba5a20886f620379c Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Fri, 17 Jun 2016 10:11:10 +0300
++Subject: Suppress urllib3 socks dependency warnings.
++
++Patch-Name: ignore-socks-warnings.patch
++---
++ pip/__init__.py | 9 +++++++++
++ 1 file changed, 9 insertions(+)
++
++diff --git a/pip/__init__.py b/pip/__init__.py
++index 588c881..ea785c3 100755
++--- a/pip/__init__.py
+++++ b/pip/__init__.py
++@@ -39,6 +39,15 @@ logger = logging.getLogger(__name__)
++ # Hide the InsecureRequestWArning from urllib3
++ warnings.filterwarnings("ignore", category=InsecureRequestWarning)
++ 
+++# 2016-06-17 barry at debian.org: urllib3 1.14 added optional support for socks,
+++# but if invoked (i.e. imported), it will issue a warning to stderr if socks
+++# isn't available.  requests unconditionally imports urllib3's socks contrib
+++# module, triggering this warning.  The warning breaks DEP-8 tests (because of
+++# the stderr output) and is just plain annoying in normal usage.  I don't want
+++# to add socks as yet another dependency for pip, nor do I want to allow-stder
+++# in the DEP-8 tests, so just suppress the warning.
+++from urllib3.exceptions import DependencyWarning
+++warnings.filterwarnings('ignore', DependencyWarning)
++ 
++ def autocomplete():
++     """Command and option completion for the main option parser (and options)
diff --cc debian/patches/series
index 208e71a,0000000..89c28e1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +hands-off-system-packages.patch
 +debundle.patch
 +handle-unbundled-requests.patch
 +set_user_default.patch
 +skip-bad-requirements.patch
++ignore-socks-warnings.patch

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