diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:18:58 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:18:58 +0000 |
| commit | 848cfa23e149e4bbc85d42fa2ef2979dc9fe9c4c (patch) | |
| tree | 8ff54699b8ca226339393ce892f295f232977cfc /Lib/lib2to3/main.py | |
| parent | 4cb64ad8bbeb3c4015d3ed1b55431dc3432f4f18 (diff) | |
| download | cpython-git-848cfa23e149e4bbc85d42fa2ef2979dc9fe9c4c.tar.gz | |
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 16:57:29 -0500 (Fri, 15 Oct 2010) | 1 line
escape() is now in the html module
........
r86156 | georg.brandl | 2010-11-04 03:34:57 -0500 (Thu, 04 Nov 2010) | 1 line
Consistency fixes in option parser help texts.
........
r86157 | georg.brandl | 2010-11-04 03:35:30 -0500 (Thu, 04 Nov 2010) | 1 line
#10286: fix urllib class names.
........
r86464 | benjamin.peterson | 2010-11-14 09:28:52 -0600 (Sun, 14 Nov 2010) | 1 line
match only .py files #10416
........
Diffstat (limited to 'Lib/lib2to3/main.py')
| -rw-r--r-- | Lib/lib2to3/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/lib2to3/main.py b/Lib/lib2to3/main.py index ffa42ab76c..3929db70d3 100644 --- a/Lib/lib2to3/main.py +++ b/Lib/lib2to3/main.py @@ -101,7 +101,7 @@ def main(fixer_pkg, args=None): parser.add_option("-j", "--processes", action="store", default=1, type="int", help="Run 2to3 concurrently") 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", help="List available transformations") parser.add_option("-p", "--print-function", action="store_true", @@ -113,7 +113,7 @@ def main(fixer_pkg, args=None): parser.add_option("-w", "--write", action="store_true", help="Write back modified files") 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 refactor_stdin = False |