diff options
author | Benjamin Peterson <benjamin@python.org> | 2013-12-20 21:42:10 -0600 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2013-12-20 21:42:10 -0600 |
commit | e6078b1bbf96402a60e8f15a87a9e3d37997643a (patch) | |
tree | 6b9cbb490e685cd143e52ea2c7c3cac6f766fecb | |
parent | 23a3d2d504c1875d5eba8cc0abab3b127714c533 (diff) | |
parent | b92f218239ea695f23bebe6659c150b166dfc281 (diff) | |
download | six-e6078b1bbf96402a60e8f15a87a9e3d37997643a.tar.gz |
Merged in alexanderlukanin13/six/u_backslash (pull request #23)
fixed six.u('\\\\') in Python 2
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | documentation/index.rst | 1 | ||||
-rw-r--r-- | six.py | 1 |
3 files changed, 4 insertions, 0 deletions
@@ -6,6 +6,8 @@ This file lists the changes in each six version. Development version ------------------- +- Pull request #21: Add import mapping for urllib's proxy_bypass function. + - Issue #43: Add import mapping for the Python 2 xmlrpclib module. - Issue #39: Add import mapping for the Python 2 thread module. diff --git a/documentation/index.rst b/documentation/index.rst index ee8b60d..394fb9c 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -617,6 +617,7 @@ Contains items from Python 3's :mod:`py3:urllib.request` and Python 2's: * :func:`py2:urllib.urlcleanup` * :class:`py2:urllib.URLopener` * :class:`py2:urllib.FancyURLopener` +* :func:`py2:urllib.proxy_bypass` and :mod:`py2:urllib2`: @@ -285,6 +285,7 @@ _urllib_request_moved_attributes = [ MovedAttribute("urlcleanup", "urllib", "urllib.request"), MovedAttribute("URLopener", "urllib", "urllib.request"), MovedAttribute("FancyURLopener", "urllib", "urllib.request"), + MovedAttribute("proxy_bypass", "urllib", "urllib.request"), ] for attr in _urllib_request_moved_attributes: setattr(Module_six_moves_urllib_request, attr.name, attr) |