aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Lib/lib2to3/fixes/fix_urllib.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-07-21 12:55:57 +0000
committerBenjamin Peterson <benjamin@python.org>2009-07-21 12:55:57 +0000
commitdd6a4edc4554cdb808f08a9ade7e40ed5addc94d (patch)
treeaccdbab3c1fe2e088a6437d5598bc921f22c10b0 /Lib/lib2to3/fixes/fix_urllib.py
parentafcd5f36f00d3a368004c574642175f623ce8ad4 (diff)
downloadcpython-dd6a4edc4554cdb808f08a9ade7e40ed5addc94d.tar.gz
cpython-dd6a4edc4554cdb808f08a9ade7e40ed5addc94d.zip
merge 2to3 improvments
Diffstat (limited to 'Lib/lib2to3/fixes/fix_urllib.py')
-rw-r--r--Lib/lib2to3/fixes/fix_urllib.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/lib2to3/fixes/fix_urllib.py b/Lib/lib2to3/fixes/fix_urllib.py
index a89266effda..d11220c5e18 100644
--- a/Lib/lib2to3/fixes/fix_urllib.py
+++ b/Lib/lib2to3/fixes/fix_urllib.py
@@ -12,13 +12,13 @@ from ..fixer_util import Name, Comma, FromImport, Newline, attr_chain
MAPPING = {'urllib': [
('urllib.request',
['URLOpener', 'FancyURLOpener', 'urlretrieve',
- '_urlopener', 'urlopen', 'urlcleanup']),
+ '_urlopener', 'urlopen', 'urlcleanup',
+ 'pathname2url', 'url2pathname']),
('urllib.parse',
['quote', 'quote_plus', 'unquote', 'unquote_plus',
- 'urlencode', 'pathname2url', 'url2pathname', 'splitattr',
- 'splithost', 'splitnport', 'splitpasswd', 'splitport',
- 'splitquery', 'splittag', 'splittype', 'splituser',
- 'splitvalue', ]),
+ 'urlencode', 'splitattr', 'splithost', 'splitnport',
+ 'splitpasswd', 'splitport', 'splitquery', 'splittag',
+ 'splittype', 'splituser', 'splitvalue', ]),
('urllib.error',
['ContentTooShortError'])],
'urllib2' : [