mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 05:31:20 +00:00 
			
		
		
		
	 b0871cac11
			
		
	
	
		b0871cac11
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines
  Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line
    wrap with parens
  ........
    r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line
    use parens
  ........
    r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line
    things which use touch_import should be pre order
  ........
    r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines
    This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers.
  ........
    r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line
    allow star_expr in testlist_gexp
  ........
    r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line
    wrap long line
  ........
    r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line
    cleanup
  ........
    r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line
    when there's a None value and a traceback, don't call type with it #9661
  ........
    r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines
    Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code.
  ........
    r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line
    fix urllib fixer with multiple as imports on a line #10069
  ........
    r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line
    stop abusing docstrings
  ........
    r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line
    kill sibling import
  ........
    r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line
    remove trailing whitespace
  ........
    r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line
    typo
  ........
................
		
	
			
		
			
				
	
	
		
			197 lines
		
	
	
	
		
			8.2 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			197 lines
		
	
	
	
		
			8.2 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """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 lib2to3.fixes.fix_imports import alternates, FixImports
 | |
| from lib2to3 import fixer_base
 | |
| from lib2to3.fixer_util import (Name, Comma, FromImport, Newline,
 | |
|                                 find_indentation, Node, syms)
 | |
| 
 | |
| MAPPING = {"urllib":  [
 | |
|                 ("urllib.request",
 | |
|                     ["URLOpener", "FancyURLOpener", "urlretrieve",
 | |
|                      "_urlopener", "urlopen", "urlcleanup",
 | |
|                      "pathname2url", "url2pathname"]),
 | |
|                 ("urllib.parse",
 | |
|                     ["quote", "quote_plus", "unquote", "unquote_plus",
 | |
|                      "urlencode", "splitattr", "splithost", "splitnport",
 | |
|                      "splitpasswd", "splitport", "splitquery", "splittag",
 | |
|                      "splittype", "splituser", "splitvalue", ]),
 | |
|                 ("urllib.error",
 | |
|                     ["ContentTooShortError"])],
 | |
|            "urllib2" : [
 | |
|                 ("urllib.request",
 | |
|                     ["urlopen", "install_opener", "build_opener",
 | |
|                      "Request", "OpenerDirector", "BaseHandler",
 | |
|                      "HTTPDefaultErrorHandler", "HTTPRedirectHandler",
 | |
|                      "HTTPCookieProcessor", "ProxyHandler",
 | |
|                      "HTTPPasswordMgr",
 | |
|                      "HTTPPasswordMgrWithDefaultRealm",
 | |
|                      "AbstractBasicAuthHandler",
 | |
|                      "HTTPBasicAuthHandler", "ProxyBasicAuthHandler",
 | |
|                      "AbstractDigestAuthHandler",
 | |
|                      "HTTPDigestAuthHandler", "ProxyDigestAuthHandler",
 | |
|                      "HTTPHandler", "HTTPSHandler", "FileHandler",
 | |
|                      "FTPHandler", "CacheFTPHandler",
 | |
|                      "UnknownHandler"]),
 | |
|                 ("urllib.error",
 | |
|                     ["URLError", "HTTPError"]),
 | |
|            ]
 | |
| }
 | |
| 
 | |
| # Duplicate the url parsing functions for urllib2.
 | |
| MAPPING["urllib2"].append(MAPPING["urllib"][1])
 | |
| 
 | |
| 
 | |
| 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
 | |
|             # bare_with_attr has a special significance for FixImports.match().
 | |
|             yield """power< bare_with_attr=%r trailer< '.' member=%s > any* >
 | |
|                   """ % (old_module, members)
 | |
| 
 | |
| 
 | |
| class FixUrllib(FixImports):
 | |
| 
 | |
|     def build_pattern(self):
 | |
|         return "|".join(build_pattern())
 | |
| 
 | |
|     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.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.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["members"]
 | |
|             for member in members:
 | |
|                 # we only care about the actual members
 | |
|                 if member.type == syms.import_as_name:
 | |
|                     as_name = member.children[2].value
 | |
|                     member_name = member.children[0].value
 | |
|                 else:
 | |
|                     member_name = member.value
 | |
|                     as_name = None
 | |
|                 if member_name != ",":
 | |
|                     for change in MAPPING[mod_member.value]:
 | |
|                         if member_name in change[1]:
 | |
|                             if change[0] not in mod_dict:
 | |
|                                 modules.append(change[0])
 | |
|                             mod_dict.setdefault(change[0], []).append(member)
 | |
| 
 | |
|             new_nodes = []
 | |
|             indentation = find_indentation(node)
 | |
|             first = True
 | |
|             def handle_name(name, prefix):
 | |
|                 if name.type == syms.import_as_name:
 | |
|                     kids = [Name(name.children[0].value, prefix=prefix),
 | |
|                             name.children[1].clone(),
 | |
|                             name.children[2].clone()]
 | |
|                     return [Node(syms.import_as_name, kids)]
 | |
|                 return [Name(name.value, prefix=prefix)]
 | |
|             for module in modules:
 | |
|                 elts = mod_dict[module]
 | |
|                 names = []
 | |
|                 for elt in elts[:-1]:
 | |
|                     names.extend(handle_name(elt, pref))
 | |
|                     names.append(Comma())
 | |
|                 names.extend(handle_name(elts[-1], pref))
 | |
|                 new = FromImport(module, names)
 | |
|                 if not first or node.parent.prefix.endswith(indentation):
 | |
|                     new.prefix = indentation
 | |
|                 new_nodes.append(new)
 | |
|                 first = False
 | |
|             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("bare_with_attr")
 | |
|         member = results.get("member")
 | |
|         new_name = None
 | |
|         if isinstance(member, list):
 | |
|             member = member[0]
 | |
|         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.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("bare_with_attr"):
 | |
|             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")
 |