[Python-modules-commits] [python-pip] 16/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 07f5a944064f9070bf22363eeb815f557d5cd2f4
Merge: 67a6210 de20a72
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jun 17 10:42:24 2016 +0300

    merge patched into master

 debian/.git-dpm                            |  4 ++--
 debian/patches/ignore-socks-warnings.patch | 27 +++++++++++++++------------
 pip/__init__.py                            | 21 ++++++++++++---------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index 9a5d8d3,0000000..04f5de8
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
- 5d7438645cf639fc55fe3e110d9bcf65d5700b46
- 5d7438645cf639fc55fe3e110d9bcf65d5700b46
++de20a722f0a3aab9ece68376cc905fbd5f9b5055
++de20a722f0a3aab9ece68376cc905fbd5f9b5055
 +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 6af3293,0000000..7c11bc2
mode 100644,000000..100644
--- a/debian/patches/ignore-socks-warnings.patch
+++ b/debian/patches/ignore-socks-warnings.patch
@@@ -1,30 -1,0 +1,33 @@@
- From 5d7438645cf639fc55fe3e110d9bcf65d5700b46 Mon Sep 17 00:00:00 2001
++From de20a722f0a3aab9ece68376cc905fbd5f9b5055 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(+)
++ pip/__init__.py | 12 ++++++++++++
++ 1 file changed, 12 insertions(+)
 +
 +diff --git a/pip/__init__.py b/pip/__init__.py
- index 588c881..6d40b2f 100755
++index 588c881..16e9fdd 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)
++@@ -10,6 +10,18 @@ import warnings
++ import sys
++ import re
 + 
 ++# 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
+++# in the DEP-8 tests, so just suppress the warning.  pdb tells me this has to
+++# be done before the import of pip.vcs.
+++from pip._vendor.requests.packages.urllib3.exceptions import DependencyWarning
 ++warnings.filterwarnings('ignore', category=DependencyWarning)
-  
-  def autocomplete():
-      """Command and option completion for the main option parser (and options)
+++
+++
++ from pip.exceptions import InstallationError, CommandError, PipError
++ from pip.utils import get_installed_distributions, get_prog
++ from pip.utils import deprecation, dist_is_editable

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