[Python-checkins] r83801 - sandbox/trunk/2to3/lib2to3/fixes/fix_urllib.py
benjamin.peterson
python-checkins at python.org
Sun Aug 8 02:02:10 CEST 2010
Author: benjamin.peterson
Date: Sun Aug 8 02:02:10 2010
New Revision: 83801
Log:
cleanup; style-nits
Modified:
sandbox/trunk/2to3/lib2to3/fixes/fix_urllib.py
Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_urllib.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_urllib.py (original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_urllib.py Sun Aug 8 02:02:10 2010
@@ -5,40 +5,40 @@
# Author: Nick Edds
# Local imports
-from .fix_imports import alternates, FixImports
-from .. import fixer_base
-from ..fixer_util import (Name, Comma, FromImport, Newline, attr_chain,
- find_indentation)
-
-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']),
+from lib2to3.fixes.fix_imports import alternates, FixImports
+from lib2to3 import fixer_base
+from lib2to3.fixer_util import (Name, Comma, FromImport, Newline,
+ find_indentation)
+
+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"]),
]
}
@@ -79,7 +79,7 @@
import name with a comma separated list of its
replacements.
"""
- import_mod = results.get('module')
+ import_mod = results.get("module")
pref = import_mod.prefix
names = []
@@ -95,9 +95,9 @@
the module to be imported from with the appropriate new
module.
"""
- mod_member = results.get('mod_member')
+ mod_member = results.get("mod_member")
pref = mod_member.prefix
- member = results.get('member')
+ member = results.get("member")
# Simple case with only a single member being imported
if member:
@@ -112,19 +112,18 @@
if new_name:
mod_member.replace(Name(new_name, prefix=pref))
else:
- self.cannot_convert(node,
- 'This is an invalid module element')
+ 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']
+ members = results["members"]
for member in members:
member = member.value
# we only care about the actual members
- if member != u',':
+ if member != u",":
for change in MAPPING[mod_member.value]:
if member in change[1]:
if change[0] in mod_dict:
@@ -152,12 +151,12 @@
nodes.append(new_nodes[-1])
node.replace(nodes)
else:
- self.cannot_convert(node, 'All module elements are invalid')
+ 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')
+ module_dot = results.get("bare_with_attr")
+ member = results.get("member")
new_name = None
if isinstance(member, list):
member = member[0]
@@ -169,17 +168,17 @@
module_dot.replace(Name(new_name,
prefix=module_dot.prefix))
else:
- self.cannot_convert(node, 'This is an invalid module element')
+ self.cannot_convert(node, "This is an invalid module element")
def transform(self, node, results):
- if results.get('module'):
+ if results.get("module"):
self.transform_import(node, results)
- elif results.get('mod_member'):
+ elif results.get("mod_member"):
self.transform_member(node, results)
- elif results.get('bare_with_attr'):
+ 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')
+ 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")
More information about the Python-checkins
mailing list