traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 85551,86156-86157,86464 via svnmerge from 

svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r85551 | benjamin.peterson | 2010-10-15 23:57:29 +0200 (Fr, 15 Okt 2010) | 1 line

  escape() is now in the html module
........
  r86156 | georg.brandl | 2010-11-04 09:34:57 +0100 (Do, 04 Nov 2010) | 1 line

  Consistency fixes in option parser help texts.
........
  r86157 | georg.brandl | 2010-11-04 09:35:30 +0100 (Do, 04 Nov 2010) | 1 line

  #10286: fix urllib class names.
........
  r86464 | benjamin.peterson | 2010-11-14 16:28:52 +0100 (So, 14 Nov 2010) | 1 line

  match only .py files #10416
........
This commit is contained in:
Martin v. Löwis 2010-12-03 23:11:07 +00:00
parent 4b9b197518
commit e2bb4eb77b
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/lib2to3/fixes/fix_urllib.py
View File

@ -12,7 +12,7 @@ from lib2to3.fixer_util import (Name, Comma, FromImport, Newline,
MAPPING = {"urllib": [ MAPPING = {"urllib": [
("urllib.request", ("urllib.request",
["URLOpener", "FancyURLOpener", "urlretrieve", ["URLopener", "FancyURLopener", "urlretrieve",
"_urlopener", "urlopen", "urlcleanup", "_urlopener", "urlopen", "urlcleanup",
"pathname2url", "url2pathname"]), "pathname2url", "url2pathname"]),
("urllib.parse", ("urllib.parse",

4
Lib/lib2to3/main.py
View File

@ -100,7 +100,7 @@ def main(fixer_pkg, args=None):
parser.add_option("-j", "--processes", action="store", default=1, parser.add_option("-j", "--processes", action="store", default=1,
type="int", help="Run 2to3 concurrently") type="int", help="Run 2to3 concurrently")
parser.add_option("-x", "--nofix", action="append", default=[], parser.add_option("-x", "--nofix", action="append", default=[],
help="Prevent a fixer from being run.") help="Prevent a transformation from being run")
parser.add_option("-l", "--list-fixes", action="store_true", parser.add_option("-l", "--list-fixes", action="store_true",
help="List available transformations") help="List available transformations")
parser.add_option("-p", "--print-function", action="store_true", parser.add_option("-p", "--print-function", action="store_true",
@ -112,7 +112,7 @@ def main(fixer_pkg, args=None):
parser.add_option("-w", "--write", action="store_true", parser.add_option("-w", "--write", action="store_true",
help="Write back modified files") help="Write back modified files")
parser.add_option("-n", "--nobackups", action="store_true", default=False, parser.add_option("-n", "--nobackups", action="store_true", default=False,
help="Don't write backups for modified files.") help="Don't write backups for modified files")
# Parse command line arguments # Parse command line arguments
refactor_stdin = False refactor_stdin = False

5
Lib/lib2to3/refactor.py
View File

@ -302,13 +302,14 @@ class RefactoringTool(object):
Files and subdirectories starting with '.' are skipped. Files and subdirectories starting with '.' are skipped.
""" """
py_ext = os.extsep + "py"
for dirpath, dirnames, filenames in os.walk(dir_name): for dirpath, dirnames, filenames in os.walk(dir_name):
self.log_debug("Descending into %s", dirpath) self.log_debug("Descending into %s", dirpath)
dirnames.sort() dirnames.sort()
filenames.sort() filenames.sort()
for name in filenames: for name in filenames:
if not name.startswith(".") and \ if (not name.startswith(".") and
os.path.splitext(name)[1].endswith("py"): os.path.splitext(name)[1] == py_ext):
fullname = os.path.join(dirpath, name) fullname = os.path.join(dirpath, name)
self.refactor_file(fullname, write, doctests_only) self.refactor_file(fullname, write, doctests_only)
# Modify dirnames in-place to remove subdirs with leading dots # Modify dirnames in-place to remove subdirs with leading dots

1
Lib/lib2to3/tests/test_refactor.py
View File

@ -223,6 +223,7 @@ from __future__ import print_function"""
"hi.py", "hi.py",
".dumb", ".dumb",
".after.py", ".after.py",
"notpy.npy",
"sappy"] "sappy"]
expected = ["hi.py"] expected = ["hi.py"]
check(tree, expected) check(tree, expected)

4
Lib/lib2to3/tests/test_util.py
View File

@ -568,8 +568,8 @@ class Test_touch_import(support.TestCase):
def test_from_import(self): def test_from_import(self):
node = parse('bar()') node = parse('bar()')
fixer_util.touch_import("cgi", "escape", node) fixer_util.touch_import("html", "escape", node)
self.assertEqual(str(node), 'from cgi import escape\nbar()\n\n') self.assertEqual(str(node), 'from html import escape\nbar()\n\n')
def test_name_import(self): def test_name_import(self):
node = parse('bar()') node = parse('bar()')