[Python-modules-commits] [python-pip] 02/02: 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 4ee34d3f9ca23a1013fcc2f9314b8328636b9971
Merge: 42dc40e 0f249c6
Author: Barry Warsaw <barry at python.org>
Date:   Mon Nov 21 17:28:46 2016 -0500

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 debian/patches/html5lib-alternative-beta-name.patch | 18 ++++++++++++++++--
 pip/index.py                                        |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 609e3c3,0000000..762064c
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
- 85022cfea1a8788973a79a87c8641c6470ed3441
- 85022cfea1a8788973a79a87c8641c6470ed3441
++0f249c6999e342e191c93323bdcb6252496e584b
++0f249c6999e342e191c93323bdcb6252496e584b
 +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/html5lib-alternative-beta-name.patch
index 85a9bd5,0000000..c959b2d
mode 100644,000000..100644
--- a/debian/patches/html5lib-alternative-beta-name.patch
+++ b/debian/patches/html5lib-alternative-beta-name.patch
@@@ -1,23 -1,0 +1,37 @@@
- From 85022cfea1a8788973a79a87c8641c6470ed3441 Mon Sep 17 00:00:00 2001
++From 0f249c6999e342e191c93323bdcb6252496e584b Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at python.org>
 +Date: Mon, 21 Nov 2016 13:27:41 -0500
 +Subject: Use alternative html5lib beta version number.
 +
 +This matches what's in the Debian archive.
 +
 +Patch-Name: html5lib-alternative-beta-name.patch
 +---
 + pip/_vendor/vendor.txt | 2 +-
-  1 file changed, 1 insertion(+), 1 deletion(-)
++ pip/index.py           | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/pip/_vendor/vendor.txt b/pip/_vendor/vendor.txt
 +index c2917c2..0871ef6 100644
 +--- a/pip/_vendor/vendor.txt
 ++++ b/pip/_vendor/vendor.txt
 +@@ -1,5 +1,5 @@
 + distlib==0.2.3
 +-html5lib==1.0b8
 ++html5lib==0.999999999-1
 + six==1.10.0
 + colorama==0.3.7
 + requests==2.10.0
++diff --git a/pip/index.py b/pip/index.py
++index cae4c2d..5dfed36 100644
++--- a/pip/index.py
+++++ b/pip/index.py
++@@ -692,7 +692,7 @@ class HTMLPage(object):
++         self.content = content
++         self.parsed = html5lib.parse(
++             self.content,
++-            encoding=encoding,
+++            likely_encoding=encoding,
++             namespaceHTMLElements=False,
++         )
++         self.url = url

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