mirror of
https://github.com/python/cpython.git
synced 2025-11-03 19:34:08 +00:00
Merged revisions 63634 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r63634 | martin.v.loewis | 2008-05-25 16:58:01 +0200 (So, 25 Mai 2008) | 81 lines
Merged revisions 62647-63633 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63047 | alexandre.vassalotti | 2008-05-11 11:03:24 +0200 (So, 11 Mai 2008) | 2 lines
Added import fixer for copy_reg rename.
........
r63081 | alexandre.vassalotti | 2008-05-11 22:06:36 +0200 (So, 11 Mai 2008) | 2 lines
Added import fixer for Queue rename.
........
r63090 | alexandre.vassalotti | 2008-05-11 22:38:16 +0200 (So, 11 Mai 2008) | 2 lines
Added import fixer for PixMapWrapper rename.
........
r63141 | alexandre.vassalotti | 2008-05-12 04:42:03 +0200 (Mo, 12 Mai 2008) | 5 lines
Added fixer for SocketServer renaming.
Removed PixMapWrapper fixer, since the module is actually pending
removal.
........
r63252 | alexandre.vassalotti | 2008-05-15 01:10:20 +0200 (Do, 15 Mai 2008) | 2 lines
Added fixer for ConfigParser rename.
........
r63321 | collin.winter | 2008-05-15 19:42:58 +0200 (Do, 15 Mai 2008) | 1 line
Add a missing comma. Fixes issue 2866.
........
r63356 | alexandre.vassalotti | 2008-05-16 08:55:44 +0200 (Fr, 16 Mai 2008) | 4 lines
Added new tests for fix_imports.
Added refactoring support of from-import statements of the style:
from foo import bar, baz
........
r63362 | alexandre.vassalotti | 2008-05-16 09:17:53 +0200 (Fr, 16 Mai 2008) | 2 lines
Added the repr module import fixer.
........
r63456 | georg.brandl | 2008-05-18 21:51:18 +0200 (So, 18 Mai 2008) | 2 lines
#2908: fixers for Tkinter rename.
........
r63461 | georg.brandl | 2008-05-18 23:00:20 +0200 (So, 18 Mai 2008) | 2 lines
Fix for last patch.
........
r63525 | alexandre.vassalotti | 2008-05-21 23:43:29 +0200 (Mi, 21 Mai 2008) | 4 lines
Add missing comma in fix_imports.
Bug caught by Quentin Gallet-Gilles.
........
r63532 | brett.cannon | 2008-05-22 05:02:43 +0200 (Do, 22 Mai 2008) | 4 lines
When testing fix_imports, no need to only test a subset of input; test it all!
Do all revisions to the sandbox need to be manually applied to the trunk?
........
r63533 | brett.cannon | 2008-05-22 05:16:45 +0200 (Do, 22 Mai 2008) | 1 line
Add _markupbase to the import fixer.
........
r63612 | georg.brandl | 2008-05-25 09:56:59 +0200 (So, 25 Mai 2008) | 2 lines
Add fixer for _winreg rename.
........
r63627 | georg.brandl | 2008-05-25 14:30:10 +0200 (So, 25 Mai 2008) | 2 lines
Add fixer entry for the thread module.
........
r63629 | georg.brandl | 2008-05-25 14:34:13 +0200 (So, 25 Mai 2008) | 2 lines
Fixer entry for dummy_thread.
........
r63633 | martin.v.loewis | 2008-05-25 16:52:41 +0200 (So, 25 Mai 2008) | 2 lines
Temporarily disable Test_imports.
........
................
This commit is contained in:
Martin v. Löwis
parent
2067bfdf25
commit
2eab97c9a6
2 changed files with 158 additions and 9 deletions
|
|
@ -14,10 +14,143 @@ import builtins
|
|||
builtin_names = [name for name in dir(builtins)
|
||||
if name not in ("__name__", "__doc__")]
|
||||
|
||||
# XXX(alexandre): It would be possible to get the modules exports by fetching
|
||||
# XXX: their __all__ attribute. However, I fear that this would add an additional
|
||||
# XXX: overhead to the fixer.
|
||||
MAPPING = {"StringIO": ("io", ["StringIO"]),
|
||||
"cStringIO": ("io", ["StringIO"]),
|
||||
"__builtin__" : ("builtins", builtin_names),
|
||||
}
|
||||
'copy_reg': ('copyreg', ['pickle',
|
||||
'constructor',
|
||||
'add_extension',
|
||||
'remove_extension',
|
||||
'clear_extension_cache']),
|
||||
'Queue': ('queue', ['Empty', 'Full', 'Queue',
|
||||
'PriorityQueue', 'LifoQueue']),
|
||||
'SocketServer': ('socketserver',
|
||||
['TCPServer', 'UDPServer', 'BaseServer',
|
||||
'ForkingUDPServer', 'ForkingTCPServer',
|
||||
'ThreadingUDPServer', 'ThreadingTCPServer',
|
||||
'BaseRequestHandler', 'StreamRequestHandler',
|
||||
'DatagramRequestHandler', 'ThreadingMixIn',
|
||||
'ForkingMixIn', 'UnixStreamServer',
|
||||
'UnixDatagramServer', 'ThreadingUnixStreamServer',
|
||||
'ThreadingUnixDatagramServer']),
|
||||
'ConfigParser': ('configparser',
|
||||
['NoSectionError', 'DuplicateSectionError',
|
||||
'NoOptionError', 'InterpolationError',
|
||||
'InterpolationDepthError',
|
||||
'InterpolationSyntaxError',
|
||||
'ParsingError', 'MissingSectionHeaderError',
|
||||
'ConfigParser', 'SafeConfigParser',
|
||||
'RawConfigParser', 'DEFAULTSECT',
|
||||
'MAX_INTERPOLATION_DEPTH']),
|
||||
'repr': ('reprlib', ['Repr', 'repr']),
|
||||
'FileDialog': ('tkinter.filedialog',
|
||||
['FileDialog', 'LoadFileDialog', 'SaveFileDialog']),
|
||||
'tkFileDialog': ('tkinter.filedialog',
|
||||
['Open', 'SaveAs', 'Directory', 'askopenfilename',
|
||||
'asksaveasfilename', 'askopenfilenames',
|
||||
'askopenfile', 'askopenfiles', 'asksaveasfile',
|
||||
'askdirectory']),
|
||||
'SimpleDialog': ('tkinter.simpledialog', ['SimpleDialog']),
|
||||
'tkSimpleDialog': ('tkinter.simpledialog',
|
||||
['Dialog', 'askinteger', 'askfloat',
|
||||
'askstring']),
|
||||
'tkColorChooser': ('tkinter.colorchooser', ['Chooser', 'askcolor']),
|
||||
'tkCommonDialog': ('tkinter.commondialog', ['Dialog']),
|
||||
'Dialog': ('tkinter.dialog', ['Dialog']),
|
||||
'Tkdnd': ('tkinter.dnd', ['DndHandler']),
|
||||
'tkFont': ('tkinter.font',
|
||||
['nametofont', 'Font', 'families', 'names']),
|
||||
'tkMessageBox': ('tkinter.messagebox',
|
||||
['Message', 'showinfo', 'showwarning', 'showerror',
|
||||
'askquestion', 'askokcancel', 'askyesno',
|
||||
'askyesnocancel', 'askretrycancel']),
|
||||
'ScrolledText': ('tkinter.scrolledtext', ['ScrolledText']),
|
||||
'turtle': ('tkinter.turtle',
|
||||
['RawPen', 'Pen', 'Turtle', 'degrees', 'radian', 'reset',
|
||||
'clear', 'tracer', 'forward', 'backward', 'left',
|
||||
'right', 'up', 'down', 'width', 'color', 'write', 'fill',
|
||||
'begin_fill', 'end_fill', 'circle', 'goto', 'heading',
|
||||
'setheading', 'position', 'window_width', 'setx', 'sety',
|
||||
'towards', 'done', 'delay', 'speed', 'setup', 'title']),
|
||||
'Tkconstants': ('tkinter.constants',
|
||||
['NO', 'FALSE', 'OFF', 'YES', 'TRUE', 'ON', 'N', 'S',
|
||||
'W', 'E', 'NW', 'SW', 'SE', 'NE', 'NS', 'EW',
|
||||
'NSEW', 'CENTER', 'NONE', 'X', 'Y', 'BOTH', 'LEFT',
|
||||
'TOP', 'RIGHT', 'BOTTOM', 'RAISED', 'SUNKEN',
|
||||
'FLAT', 'RIDGE', 'GROOVE', 'SOLID', 'HORIZONTAL',
|
||||
'VERTICAL', 'NUMERIC', 'CHAR', 'WORD', 'BASELINE',
|
||||
'INSIDE', 'OUTSIDE', 'SEL', 'SEL_FIRST', 'SEL_LAST',
|
||||
'END', 'INSERT', 'CURRENT', 'ANCHOR', 'ALL',
|
||||
'NORMAL', 'DISABLED', 'ACTIVE', 'HIDDEN', 'CASCADE',
|
||||
'CHECKBUTTON', 'COMMAND', 'RADIOBUTTON',
|
||||
'SEPARATOR', 'SINGLE', 'BROWSE', 'MULTIPLE',
|
||||
'EXTENDED', 'DOTBOX', 'UNDERLINE', 'PIESLICE',
|
||||
'CHORD', 'ARC', 'FIRST', 'LAST', 'BUTT',
|
||||
'PROJECTING', 'ROUND', 'BEVEL', 'MITTER', 'MOVETO',
|
||||
'SCROLL', 'UNITS', 'PAGES']),
|
||||
'Tix': ('tkinter.tix',
|
||||
['tixCommand', 'Tk', 'Form', 'TixWidget', 'TixSubWidget',
|
||||
'DisplayStyle', 'Balloon', 'ButtonBox', 'ComboBox',
|
||||
'Control', 'DirList', 'DirTree', 'DirSelectBox',
|
||||
'ExFileSelectBox', 'DirSelectDialog', 'ExFileSelectDialog',
|
||||
'FileSelectBox', 'FileSelectDialog', 'FileEntry', 'HList',
|
||||
'InputOnly', 'LabelEntry', 'LabelFrame', 'ListNoteBook',
|
||||
'Meter', 'NoteBook', 'OptionMenu', 'PanedWindow',
|
||||
'PopupMenu', 'ResizeHandle', 'ScrolledHList',
|
||||
'ScrolledListBox', 'ScrolledText', 'ScrolledTList',
|
||||
'ScrolledWindow', 'Select', 'Shell', 'DialogShell',
|
||||
'StdButtonBox', 'TList', 'Tree', 'CheckList', 'OptionName',
|
||||
'FileTypeList', 'Grid', 'ScrolledGrid']),
|
||||
'Tkinter': ('tkinter',
|
||||
['_flatten', 'TclError', 'TkVersion', 'TclVersion',
|
||||
'Variable', 'StringVar', 'IntVar', 'DoubleVar',
|
||||
'BooleanVar','mainloop', 'Tk', 'Tcl', 'Toplevel',
|
||||
'Button', 'Canvas', 'Checkbutton', 'Entry', 'Frame',
|
||||
'Label', 'Listbox', 'Menu', 'Menubutton',
|
||||
'Radiobutton', 'Scale', 'Scrollbar', 'Text',
|
||||
'OptionMenu', 'Image', 'PhotoImage', 'BitmapImage',
|
||||
'image_names', 'image_types', 'Spinbox', 'LabelFrame',
|
||||
'PanedWindow', 'Studbutton', 'Tributton']),
|
||||
'markupbase': ('_markupbase', ['ParserBase']),
|
||||
'_winreg': ('winreg', [
|
||||
'CloseKey', 'ConnectRegistry', 'CreateKey', 'DeleteKey',
|
||||
'DeleteValue', 'DisableReflectionKey', 'EnableReflectionKey',
|
||||
'EnumKey', 'EnumValue', 'ExpandEnvironmentStrings', 'FlushKey',
|
||||
'LoadKey', 'OpenKey', 'OpenKeyEx', 'QueryValue', 'QueryValueEx',
|
||||
'QueryInfoKey', 'QueryReflectionKey', 'SaveKey', 'SetValue',
|
||||
'SetValueEx', 'HKEY_CLASSES_ROOT', 'HKEY_CURRENT_USER',
|
||||
'HKEY_LOCAL_MACHINE', 'HKEY_USERS', 'HKEY_PERFORMANCE_DATA',
|
||||
'HKEY_CURRENT_CONFIG', 'HKEY_DYN_DATA', 'KEY_QUERY_VALUE',
|
||||
'KEY_SET_VALUE', 'KEY_CREATE_SUB_KEY', 'KEY_ENUMERATE_SUB_KEYS',
|
||||
'KEY_NOTIFY', 'KEY_CREATE_LINK', 'KEY_READ', 'KEY_WRITE',
|
||||
'KEY_EXECUTE', 'KEY_ALL_ACCESS', 'KEY_WOW64_64KEY',
|
||||
'KEY_WOW64_32KEY', 'REG_OPTION_RESERVED',
|
||||
'REG_OPTION_NON_VOLATILE', 'REG_OPTION_VOLATILE',
|
||||
'REG_OPTION_CREATE_LINK', 'REG_OPTION_BACKUP_RESTORE',
|
||||
'REG_OPTION_OPEN_LINK', 'REG_LEGAL_OPTION',
|
||||
'REG_CREATED_NEW_KEY', 'REG_OPENED_EXISTING_KEY',
|
||||
'REG_WHOLE_HIVE_VOLATILE', 'REG_REFRESH_HIVE',
|
||||
'REG_NO_LAZY_FLUSH', 'REG_NOTIFY_CHANGE_NAME',
|
||||
'REG_NOTIFY_CHANGE_ATTRIBUTES', 'REG_NOTIFY_CHANGE_LAST_SET',
|
||||
'REG_NOTIFY_CHANGE_SECURITY', 'REG_LEGAL_CHANGE_FILTER',
|
||||
'REG_NONE', 'REG_SZ', 'REG_EXPAND_SZ', 'REG_BINARY', 'REG_DWORD',
|
||||
'REG_DWORD_LITTLE_ENDIAN', 'REG_DWORD_BIG_ENDIAN', 'REG_LINK',
|
||||
'REG_MULTI_SZ', 'REG_RESOURCE_LIST',
|
||||
'REG_FULL_RESOURCE_DESCRIPTOR', 'REG_RESOURCE_REQUIREMENTS_LIST']),
|
||||
'thread': ('_thread',
|
||||
['LockType', '_local', 'allocate', 'allocate_lock',
|
||||
'error', 'exit', 'exit_thread', 'get_ident',
|
||||
'interrupt_main', 'stack_size', 'start_new',
|
||||
'start_new_thread']),
|
||||
'dummy_thread': ('_dummy_thread',
|
||||
['LockType', '_local', 'allocate', 'allocate_lock',
|
||||
'error', 'exit', 'exit_thread', 'get_ident',
|
||||
'interrupt_main', 'stack_size', 'start_new',
|
||||
'start_new_thread']),
|
||||
}
|
||||
|
||||
|
||||
def alternates(members):
|
||||
|
|
@ -34,7 +167,8 @@ def build_pattern():
|
|||
| dotted_as_names< any* module=%r any* >) >
|
||||
""" % (old_module, old_module)
|
||||
yield """import_from< 'from' module_name=%r 'import'
|
||||
( %s | import_as_name< %s 'as' any >) >
|
||||
( %s | import_as_name< %s 'as' any > |
|
||||
import_as_names< any* >) >
|
||||
""" % (old_module, members, members)
|
||||
yield """import_from< 'from' module_name=%r 'import' star='*' >
|
||||
""" % old_module
|
||||
|
|
|
|||
|
|
@ -1405,14 +1405,12 @@ class Test_xreadlines(FixerTestCase):
|
|||
s = "foo(xreadlines)"
|
||||
self.unchanged(s)
|
||||
|
||||
class Test_imports(FixerTestCase):
|
||||
# Disable test, as it takes a too long time to run, and also
|
||||
# fails in 2.6.
|
||||
#class Test_imports(FixerTestCase):
|
||||
class Test_imports:
|
||||
fixer = "imports"
|
||||
|
||||
modules = {"StringIO": ("io", ["StringIO"]),
|
||||
"cStringIO": ("io", ["StringIO"]),
|
||||
"__builtin__" : ("builtins", ["open", "Exception",
|
||||
"__debug__", "str"]),
|
||||
}
|
||||
from ..fixes.fix_imports import MAPPING as modules
|
||||
|
||||
def test_import_module(self):
|
||||
for old, (new, members) in list(self.modules.items()):
|
||||
|
|
@ -1434,6 +1432,13 @@ class Test_imports(FixerTestCase):
|
|||
s = "from foo import %s" % member
|
||||
self.unchanged(s)
|
||||
|
||||
b = "from %s import %s" % (old, ", ".join(members))
|
||||
a = "from %s import %s" % (new, ", ".join(members))
|
||||
self.check(b, a)
|
||||
|
||||
s = "from foo import %s" % ", ".join(members)
|
||||
self.unchanged(s)
|
||||
|
||||
def test_import_module_as(self):
|
||||
for old, (new, members) in list(self.modules.items()):
|
||||
b = "import %s as foo_bar" % old
|
||||
|
|
@ -1481,6 +1486,16 @@ class Test_imports(FixerTestCase):
|
|||
foo(%s, %s())
|
||||
""" % (new, member, member, member)
|
||||
self.check(b, a)
|
||||
b = """
|
||||
from %s import %s
|
||||
foo(%s)
|
||||
""" % (old, ", ".join(members), ", ".join(members))
|
||||
a = """
|
||||
from %s import %s
|
||||
foo(%s)
|
||||
""" % (new, ", ".join(members), ", ".join(members))
|
||||
self.check(b, a)
|
||||
|
||||
|
||||
class Test_input(FixerTestCase):
|
||||
fixer = "input"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue