aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2013-10-16 15:35:33 +0000
committerDaniele Tricoli <eriol@mornie.org>2013-10-16 15:35:33 +0000
commit0f2d7121bbe94b1b68683ad8c52bee5960d61b7c (patch)
tree03fe21d19be14cf1f079ebfdcdb50718e8549133 /debian
parentd586250c439ddfbdaf2dc485d7142083c3d58c72 (diff)
downloadpython-urllib3-0f2d7121bbe94b1b68683ad8c52bee5960d61b7c.tar
python-urllib3-0f2d7121bbe94b1b68683ad8c52bee5960d61b7c.tar.gz
Removed 05_fix_python3_syntax_error_in_ntlmpool.patch since fixed upstream
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/05_fix_python3_syntax_error_in_ntlmpool.patch15
-rw-r--r--debian/patches/series1
3 files changed, 3 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index d3bd894..7a9582d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ python-urllib3 (1.7.1-1) UNRELEASED; urgency=low
- Refreshed
* debian/patches/04_relax_nosetests_options.patch
- Refreshed
+ * debian/patches/05_fix_python3_syntax_error_in_ntlmpool.patch
+ - Removed since fixed upstream
- -- Daniele Tricoli <eriol@mornie.org> Wed, 16 Oct 2013 17:15:54 +0200
+ -- Daniele Tricoli <eriol@mornie.org> Wed, 16 Oct 2013 17:33:45 +0200
python-urllib3 (1.6-2) unstable; urgency=high
diff --git a/debian/patches/05_fix_python3_syntax_error_in_ntlmpool.patch b/debian/patches/05_fix_python3_syntax_error_in_ntlmpool.patch
deleted file mode 100644
index 7b90098..0000000
--- a/debian/patches/05_fix_python3_syntax_error_in_ntlmpool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Origin: https://github.com/shazow/urllib3/issues/177
-Description: Fix syntax error 'unicodeescape' codec can't decode bytes in
- position 130-132 for Python3
-
---- a/urllib3/contrib/ntlmpool.py
-+++ b/urllib3/contrib/ntlmpool.py
-@@ -33,7 +33,7 @@
- def __init__(self, user, pw, authurl, *args, **kwargs):
- """
- authurl is a random URL on the server that is protected by NTLM.
-- user is the Windows user, probably in the DOMAIN\username format.
-+ user is the Windows user, probably in the DOMAIN\\username format.
- pw is the password for the user.
- """
- super(NTLMConnectionPool, self).__init__(*args, **kwargs)
diff --git a/debian/patches/series b/debian/patches/series
index f44758a..b90c3c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
02_require-cert-verification.patch
03_no-setuptools.patch
04_relax_nosetests_options.patch
-05_fix_python3_syntax_error_in_ntlmpool.patch
06_fix_abuse_of_match_hostname_for_DoS.patch