Merged revisions 64863,64868,64870,64942,65001-65002,65017-65018 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r64863 | brett.cannon | 2008-07-10 19:42:32 -0500 (Thu, 10 Jul 2008) | 1 line
Add urlparse -> urllib.parse to fix_imports.
........
r64868 | brett.cannon | 2008-07-10 20:00:10 -0500 (Thu, 10 Jul 2008) | 1 line
Add robotparser -> urllib.robotparser to fix_imports.
........
r64870 | brett.cannon | 2008-07-11 00:56:27 -0500 (Fri, 11 Jul 2008) | 6 lines
Fix the fixers for the new dbm package.
Had to create a new fixer (fix_imports2) which did fixes in post-order. This
because ``import anydbm`` was being translated into ``import dbm`` which was
then subsequently changed into ``import dbm.ndbm``; one transform too many.
........
r64942 | collin.winter | 2008-07-13 20:19:05 -0500 (Sun, 13 Jul 2008) | 1 line
Add a comment explaining part of fix_imports.py
........
r65001 | brett.cannon | 2008-07-16 00:11:12 -0500 (Wed, 16 Jul 2008) | 2 lines
Remove some extraneous whitespace.
........
r65002 | brett.cannon | 2008-07-16 00:12:04 -0500 (Wed, 16 Jul 2008) | 4 lines
Implement a fixer for urllib(2).
Thanks Nick Edds for the patch.
........
r65017 | benjamin.peterson | 2008-07-16 11:04:19 -0500 (Wed, 16 Jul 2008) | 1 line
fix 2to3 in Python 2.6
........
r65018 | benjamin.peterson | 2008-07-16 11:55:21 -0500 (Wed, 16 Jul 2008) | 1 line
normalize whitespace
........
2008-07-16 14:01:46 -03:00
|
|
|
"""Fix changes imports of urllib which are now incompatible.
|
|
|
|
This is rather similar to fix_imports, but because of the more
|
|
|
|
complex nature of the fixing for urllib, it has its own fixer.
|
|
|
|
"""
|
|
|
|
# Author: Nick Edds
|
|
|
|
|
|
|
|
# Local imports
|
|
|
|
from .fix_imports import alternates, FixImports
|
|
|
|
from .. import fixer_base
|
Merged revisions 67428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67428 | benjamin.peterson | 2008-11-28 16:12:14 -0600 (Fri, 28 Nov 2008) | 57 lines
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
................
2008-11-28 19:04:28 -04:00
|
|
|
from ..fixer_util import Name, Comma, FromImport, Newline, attr_chain
|
Merged revisions 64863,64868,64870,64942,65001-65002,65017-65018 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r64863 | brett.cannon | 2008-07-10 19:42:32 -0500 (Thu, 10 Jul 2008) | 1 line
Add urlparse -> urllib.parse to fix_imports.
........
r64868 | brett.cannon | 2008-07-10 20:00:10 -0500 (Thu, 10 Jul 2008) | 1 line
Add robotparser -> urllib.robotparser to fix_imports.
........
r64870 | brett.cannon | 2008-07-11 00:56:27 -0500 (Fri, 11 Jul 2008) | 6 lines
Fix the fixers for the new dbm package.
Had to create a new fixer (fix_imports2) which did fixes in post-order. This
because ``import anydbm`` was being translated into ``import dbm`` which was
then subsequently changed into ``import dbm.ndbm``; one transform too many.
........
r64942 | collin.winter | 2008-07-13 20:19:05 -0500 (Sun, 13 Jul 2008) | 1 line
Add a comment explaining part of fix_imports.py
........
r65001 | brett.cannon | 2008-07-16 00:11:12 -0500 (Wed, 16 Jul 2008) | 2 lines
Remove some extraneous whitespace.
........
r65002 | brett.cannon | 2008-07-16 00:12:04 -0500 (Wed, 16 Jul 2008) | 4 lines
Implement a fixer for urllib(2).
Thanks Nick Edds for the patch.
........
r65017 | benjamin.peterson | 2008-07-16 11:04:19 -0500 (Wed, 16 Jul 2008) | 1 line
fix 2to3 in Python 2.6
........
r65018 | benjamin.peterson | 2008-07-16 11:55:21 -0500 (Wed, 16 Jul 2008) | 1 line
normalize whitespace
........
2008-07-16 14:01:46 -03:00
|
|
|
|
|
|
|
MAPPING = {'urllib': [
|
|
|
|
('urllib.request',
|
|
|
|
['URLOpener', 'FancyURLOpener', 'urlretrieve',
|
|
|
|
'_urlopener', 'urlcleanup']),
|
|
|
|
('urllib.parse',
|
|
|
|
['quote', 'quote_plus', 'unquote', 'unquote_plus',
|
|
|
|
'urlencode', 'pahtname2url', 'url2pathname']),
|
|
|
|
('urllib.error',
|
|
|
|
['ContentTooShortError'])],
|
|
|
|
'urllib2' : [
|
|
|
|
('urllib.request',
|
|
|
|
['urlopen', 'install_opener', 'build_opener',
|
|
|
|
'Request', 'OpenerDirector', 'BaseHandler',
|
|
|
|
'HTTPDefaultErrorHandler', 'HTTPRedirectHandler',
|
|
|
|
'HTTPCookieProcessor', 'ProxyHandler',
|
|
|
|
'HTTPPasswordMgr',
|
|
|
|
'HTTPPasswordMgrWithDefaultRealm',
|
|
|
|
'AbstractBasicAuthHandler',
|
|
|
|
'HTTPBasicAuthHandler', 'ProxyBasicAuthHandler',
|
|
|
|
'AbstractDigestAuthHandler',
|
|
|
|
'HTTPDigestAuthHander', 'ProxyDigestAuthHandler',
|
|
|
|
'HTTPHandler', 'HTTPSHandler', 'FileHandler',
|
|
|
|
'FTPHandler', 'CacheFTPHandler',
|
|
|
|
'UnknownHandler']),
|
|
|
|
('urllib.error',
|
|
|
|
['URLError', 'HTTPError'])],
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# def alternates(members):
|
|
|
|
# return "(" + "|".join(map(repr, members)) + ")"
|
|
|
|
|
|
|
|
|
|
|
|
def build_pattern():
|
|
|
|
bare = set()
|
|
|
|
for old_module, changes in MAPPING.items():
|
|
|
|
for change in changes:
|
|
|
|
new_module, members = change
|
|
|
|
members = alternates(members)
|
|
|
|
yield """import_name< 'import' (module=%r
|
|
|
|
| dotted_as_names< any* module=%r any* >) >
|
|
|
|
""" % (old_module, old_module)
|
|
|
|
yield """import_from< 'from' mod_member=%r 'import'
|
|
|
|
( member=%s | import_as_name< member=%s 'as' any > |
|
|
|
|
import_as_names< members=any* >) >
|
|
|
|
""" % (old_module, members, members)
|
|
|
|
yield """import_from< 'from' module_star=%r 'import' star='*' >
|
|
|
|
""" % old_module
|
|
|
|
yield """import_name< 'import'
|
|
|
|
dotted_as_name< module_as=%r 'as' any > >
|
|
|
|
""" % old_module
|
|
|
|
yield """power< module_dot=%r trailer< '.' member=%s > any* >
|
|
|
|
""" % (old_module, members)
|
|
|
|
|
|
|
|
|
|
|
|
class FixUrllib(FixImports):
|
Merged revisions 67428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67428 | benjamin.peterson | 2008-11-28 16:12:14 -0600 (Fri, 28 Nov 2008) | 57 lines
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
................
2008-11-28 19:04:28 -04:00
|
|
|
|
|
|
|
def build_pattern(self):
|
|
|
|
return "|".join(build_pattern())
|
Merged revisions 64863,64868,64870,64942,65001-65002,65017-65018 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r64863 | brett.cannon | 2008-07-10 19:42:32 -0500 (Thu, 10 Jul 2008) | 1 line
Add urlparse -> urllib.parse to fix_imports.
........
r64868 | brett.cannon | 2008-07-10 20:00:10 -0500 (Thu, 10 Jul 2008) | 1 line
Add robotparser -> urllib.robotparser to fix_imports.
........
r64870 | brett.cannon | 2008-07-11 00:56:27 -0500 (Fri, 11 Jul 2008) | 6 lines
Fix the fixers for the new dbm package.
Had to create a new fixer (fix_imports2) which did fixes in post-order. This
because ``import anydbm`` was being translated into ``import dbm`` which was
then subsequently changed into ``import dbm.ndbm``; one transform too many.
........
r64942 | collin.winter | 2008-07-13 20:19:05 -0500 (Sun, 13 Jul 2008) | 1 line
Add a comment explaining part of fix_imports.py
........
r65001 | brett.cannon | 2008-07-16 00:11:12 -0500 (Wed, 16 Jul 2008) | 2 lines
Remove some extraneous whitespace.
........
r65002 | brett.cannon | 2008-07-16 00:12:04 -0500 (Wed, 16 Jul 2008) | 4 lines
Implement a fixer for urllib(2).
Thanks Nick Edds for the patch.
........
r65017 | benjamin.peterson | 2008-07-16 11:04:19 -0500 (Wed, 16 Jul 2008) | 1 line
fix 2to3 in Python 2.6
........
r65018 | benjamin.peterson | 2008-07-16 11:55:21 -0500 (Wed, 16 Jul 2008) | 1 line
normalize whitespace
........
2008-07-16 14:01:46 -03:00
|
|
|
|
|
|
|
def transform_import(self, node, results):
|
|
|
|
"""Transform for the basic import case. Replaces the old
|
|
|
|
import name with a comma separated list of its
|
|
|
|
replacements.
|
|
|
|
"""
|
|
|
|
import_mod = results.get('module')
|
|
|
|
pref = import_mod.get_prefix()
|
|
|
|
|
|
|
|
names = []
|
|
|
|
|
|
|
|
# create a Node list of the replacement modules
|
|
|
|
for name in MAPPING[import_mod.value][:-1]:
|
|
|
|
names.extend([Name(name[0], prefix=pref), Comma()])
|
|
|
|
names.append(Name(MAPPING[import_mod.value][-1][0], prefix=pref))
|
|
|
|
import_mod.replace(names)
|
|
|
|
|
|
|
|
def transform_member(self, node, results):
|
|
|
|
"""Transform for imports of specific module elements. Replaces
|
|
|
|
the module to be imported from with the appropriate new
|
|
|
|
module.
|
|
|
|
"""
|
|
|
|
mod_member = results.get('mod_member')
|
|
|
|
pref = mod_member.get_prefix()
|
|
|
|
member = results.get('member')
|
|
|
|
|
|
|
|
# Simple case with only a single member being imported
|
|
|
|
if member:
|
|
|
|
# this may be a list of length one, or just a node
|
|
|
|
if isinstance(member, list):
|
|
|
|
member = member[0]
|
|
|
|
new_name = None
|
|
|
|
for change in MAPPING[mod_member.value]:
|
|
|
|
if member.value in change[1]:
|
|
|
|
new_name = change[0]
|
|
|
|
break
|
|
|
|
if new_name:
|
|
|
|
mod_member.replace(Name(new_name, prefix=pref))
|
|
|
|
else:
|
|
|
|
self.cannot_convert(node,
|
|
|
|
'This is an invalid module element')
|
|
|
|
|
|
|
|
# Multiple members being imported
|
|
|
|
else:
|
|
|
|
# a dictionary for replacements, order matters
|
|
|
|
modules = []
|
|
|
|
mod_dict = {}
|
|
|
|
members = results.get('members')
|
|
|
|
for member in members:
|
|
|
|
member = member.value
|
|
|
|
# we only care about the actual members
|
|
|
|
if member != ',':
|
|
|
|
for change in MAPPING[mod_member.value]:
|
|
|
|
if member in change[1]:
|
2008-07-16 15:48:35 -03:00
|
|
|
if change[0] in mod_dict:
|
Merged revisions 64863,64868,64870,64942,65001-65002,65017-65018 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r64863 | brett.cannon | 2008-07-10 19:42:32 -0500 (Thu, 10 Jul 2008) | 1 line
Add urlparse -> urllib.parse to fix_imports.
........
r64868 | brett.cannon | 2008-07-10 20:00:10 -0500 (Thu, 10 Jul 2008) | 1 line
Add robotparser -> urllib.robotparser to fix_imports.
........
r64870 | brett.cannon | 2008-07-11 00:56:27 -0500 (Fri, 11 Jul 2008) | 6 lines
Fix the fixers for the new dbm package.
Had to create a new fixer (fix_imports2) which did fixes in post-order. This
because ``import anydbm`` was being translated into ``import dbm`` which was
then subsequently changed into ``import dbm.ndbm``; one transform too many.
........
r64942 | collin.winter | 2008-07-13 20:19:05 -0500 (Sun, 13 Jul 2008) | 1 line
Add a comment explaining part of fix_imports.py
........
r65001 | brett.cannon | 2008-07-16 00:11:12 -0500 (Wed, 16 Jul 2008) | 2 lines
Remove some extraneous whitespace.
........
r65002 | brett.cannon | 2008-07-16 00:12:04 -0500 (Wed, 16 Jul 2008) | 4 lines
Implement a fixer for urllib(2).
Thanks Nick Edds for the patch.
........
r65017 | benjamin.peterson | 2008-07-16 11:04:19 -0500 (Wed, 16 Jul 2008) | 1 line
fix 2to3 in Python 2.6
........
r65018 | benjamin.peterson | 2008-07-16 11:55:21 -0500 (Wed, 16 Jul 2008) | 1 line
normalize whitespace
........
2008-07-16 14:01:46 -03:00
|
|
|
mod_dict[change[0]].append(member)
|
|
|
|
else:
|
|
|
|
mod_dict[change[0]] = [member]
|
|
|
|
modules.append(change[0])
|
|
|
|
|
|
|
|
new_nodes = []
|
|
|
|
for module in modules:
|
|
|
|
elts = mod_dict[module]
|
|
|
|
names = []
|
|
|
|
for elt in elts[:-1]:
|
|
|
|
names.extend([Name(elt, prefix=pref), Comma()])
|
|
|
|
names.append(Name(elts[-1], prefix=pref))
|
|
|
|
new_nodes.append(FromImport(module, names))
|
|
|
|
if new_nodes:
|
|
|
|
nodes = []
|
|
|
|
for new_node in new_nodes[:-1]:
|
|
|
|
nodes.extend([new_node, Newline()])
|
|
|
|
nodes.append(new_nodes[-1])
|
|
|
|
node.replace(nodes)
|
|
|
|
else:
|
|
|
|
self.cannot_convert(node, 'All module elements are invalid')
|
|
|
|
|
|
|
|
def transform_dot(self, node, results):
|
|
|
|
"""Transform for calls to module members in code."""
|
|
|
|
module_dot = results.get('module_dot')
|
|
|
|
member = results.get('member')
|
|
|
|
# this may be a list of length one, or just a node
|
|
|
|
if isinstance(member, list):
|
|
|
|
member = member[0]
|
|
|
|
new_name = None
|
|
|
|
for change in MAPPING[module_dot.value]:
|
|
|
|
if member.value in change[1]:
|
|
|
|
new_name = change[0]
|
|
|
|
break
|
|
|
|
if new_name:
|
|
|
|
module_dot.replace(Name(new_name,
|
|
|
|
prefix=module_dot.get_prefix()))
|
|
|
|
else:
|
|
|
|
self.cannot_convert(node, 'This is an invalid module element')
|
|
|
|
|
|
|
|
def transform(self, node, results):
|
|
|
|
if results.get('module'):
|
|
|
|
self.transform_import(node, results)
|
|
|
|
elif results.get('mod_member'):
|
|
|
|
self.transform_member(node, results)
|
|
|
|
elif results.get('module_dot'):
|
|
|
|
self.transform_dot(node, results)
|
|
|
|
# Renaming and star imports are not supported for these modules.
|
|
|
|
elif results.get('module_star'):
|
|
|
|
self.cannot_convert(node, 'Cannot handle star imports.')
|
|
|
|
elif results.get('module_as'):
|
|
|
|
self.cannot_convert(node, 'This module is now multiple modules')
|