diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 23:11:07 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 23:11:07 (GMT) |
| commit | e2bb4eb77b24a1870bd7feb15124b7adf1460efe (patch) | |
| tree | 4ae64d985e9109ae08174e24158547bcc68bcda9 /Lib/lib2to3/main.py | |
| parent | 4b9b19751816cb3976263a12dfcc0caa5feb2bf4 (diff) | |
| download | cpython-e2bb4eb77b24a1870bd7feb15124b7adf1460efe.zip cpython-e2bb4eb77b24a1870bd7feb15124b7adf1460efe.tar.gz cpython-e2bb4eb77b24a1870bd7feb15124b7adf1460efe.tar.bz2 | |
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
........
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 02bae37..20ee434 100644 --- a/Lib/lib2to3/main.py +++ b/Lib/lib2to3/main.py @@ -100,7 +100,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", @@ -112,7 +112,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 |