Mercurial > cpython-lru_cache-weakref

annotate Lib/lib2to3/main.py @ 54294:dba767bc3155 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove mention of old ctypes version
author Benjamin Peterson <benjamin@python.org>
date Sat, 23 May 2009 20:59:09 +0000
parents 119e4323400d
children 732f72cbaf7d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
1 """
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
2 Main program for 2to3.
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
3 """
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
4
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
5 import sys
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
6 import os
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
7 import logging
50198
21d3357dcbec Merged revisions 67806 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 49677
diff changeset
8 import shutil
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
9 import optparse
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
10
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
11 from . import refactor
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
12
53821
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
13 class StdoutRefactoringTool(refactor.MultiprocessRefactoringTool):
49314
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
14 """
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
15 Prints output to stdout.
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
16 """
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
17
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
18 def __init__(self, fixers, options, explicit, nobackups):
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
19 self.nobackups = nobackups
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
20 super(StdoutRefactoringTool, self).__init__(fixers, options, explicit)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
21
49314
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
22 def log_error(self, msg, *args, **kwargs):
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
23 self.errors.append((msg, args, kwargs))
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
24 self.logger.error(msg, *args, **kwargs)
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
25
53934
119e4323400d Merged revisions 72491-72493 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 53821
diff changeset
26 def write_file(self, new_text, filename, old_text, encoding):
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
27 if not self.nobackups:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
28 # Make backup
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
29 backup = filename + ".bak"
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
30 if os.path.lexists(backup):
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
31 try:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
32 os.remove(backup)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
33 except os.error, err:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
34 self.log_message("Can't remove backup %s", backup)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
35 try:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
36 os.rename(filename, backup)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
37 except os.error, err:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
38 self.log_message("Can't rename %s to %s", filename, backup)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
39 # Actually write the new file
53934
119e4323400d Merged revisions 72491-72493 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 53821
diff changeset
40 write = super(StdoutRefactoringTool, self).write_file
119e4323400d Merged revisions 72491-72493 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 53821
diff changeset
41 write(new_text, filename, old_text, encoding)
50257
e4675113d10e Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50198
diff changeset
42 if not self.nobackups:
50487
a92f71d46dc4 Merged revisions 68197 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50257
diff changeset
43 shutil.copymode(backup, filename)
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
44
49314
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
45 def print_output(self, lines):
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
46 for line in lines:
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
47 print line
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
48
cdc7f636778b Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 48978
diff changeset
49
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
50 def main(fixer_pkg, args=None):
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
51 """Main program.
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
52
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
53 Args:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
54 fixer_pkg: the name of a package where the fixers are located.
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
55 args: optional; a list of command line arguments. If omitted,
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
56 sys.argv[1:] is used.
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
57
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
58 Returns a suggested exit status (0, 1, 2).
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
59 """
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
60 # Set up option parser
50198
21d3357dcbec Merged revisions 67806 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 49677
diff changeset
61 parser = optparse.OptionParser(usage="2to3 [options] file|dir ...")
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
62 parser.add_option("-d", "--doctests_only", action="store_true",
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
63 help="Fix up doctests only")
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
64 parser.add_option("-f", "--fix", action="append", default=[],
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
65 help="Each FIX specifies a transformation; default: all")
53821
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
66 parser.add_option("-j", "--processes", action="store", default=1,
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
67 type="int", help="Run 2to3 concurrently")
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
68 parser.add_option("-x", "--nofix", action="append", default=[],
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
69 help="Prevent a fixer from being run.")
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
70 parser.add_option("-l", "--list-fixes", action="store_true",
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
71 help="List available transformations (fixes/fix_*.py)")
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
72 parser.add_option("-p", "--print-function", action="store_true",
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
73 help="Modify the grammar so that print() is a function")
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
74 parser.add_option("-v", "--verbose", action="store_true",
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
75 help="More verbose logging")
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
76 parser.add_option("-w", "--write", action="store_true",
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
77 help="Write back modified files")
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
78 parser.add_option("-n", "--nobackups", action="store_true", default=False,
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
79 help="Don't write backups for modified files.")
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
80
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
81 # Parse command line arguments
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
82 refactor_stdin = False
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
83 options, args = parser.parse_args(args)
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
84 if not options.write and options.nobackups:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
85 parser.error("Can't use -n without -w")
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
86 if options.list_fixes:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
87 print "Available transformations for the -f/--fix option:"
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
88 for fixname in refactor.get_all_fix_names(fixer_pkg):
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
89 print fixname
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
90 if not args:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
91 return 0
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
92 if not args:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
93 print >>sys.stderr, "At least one file or directory argument required."
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
94 print >>sys.stderr, "Use --help to show usage."
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
95 return 2
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
96 if "-" in args:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
97 refactor_stdin = True
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
98 if options.write:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
99 print >>sys.stderr, "Can't write to stdin."
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
100 return 2
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
101
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
102 # Set up logging handler
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
103 level = logging.DEBUG if options.verbose else logging.INFO
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
104 logging.basicConfig(format='%(name)s: %(message)s', level=level)
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
105
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
106 # Initialize the refactoring tool
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
107 rt_opts = {"print_function" : options.print_function}
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
108 avail_fixes = set(refactor.get_fixers_from_package(fixer_pkg))
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
109 unwanted_fixes = set(fixer_pkg + ".fix_" + fix for fix in options.nofix)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
110 explicit = set()
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
111 if options.fix:
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
112 all_present = False
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
113 for fix in options.fix:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
114 if fix == "all":
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
115 all_present = True
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
116 else:
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
117 explicit.add(fixer_pkg + ".fix_" + fix)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
118 requested = avail_fixes.union(explicit) if all_present else explicit
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
119 else:
49677
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
120 requested = avail_fixes.union(explicit)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
121 fixer_names = requested.difference(unwanted_fixes)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
122 rt = StdoutRefactoringTool(sorted(fixer_names), rt_opts, sorted(explicit),
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from
Georg Brandl <georg@python.org>
parents: 49314
diff changeset
123 options.nobackups)
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
124
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
125 # Refactor all files and directories passed as arguments
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
126 if not rt.errors:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
127 if refactor_stdin:
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
128 rt.refactor_stdin()
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
129 else:
53821
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
130 try:
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
131 rt.refactor(args, options.write, options.doctests_only,
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
132 options.processes)
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
133 except refactor.MultiprocessingUnsupported:
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
134 assert options.processes > 1
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
135 print >> sys.stderr, "Sorry, -j isn't " \
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
136 "supported on this platform."
fb10b88afd40 Merged revisions 68503,68507,68694,69054,69673,69679-69681,70991,70999,71003,71695 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 50487
diff changeset
137 return 1
48978
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
138 rt.summarize()
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
139
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
140 # Return error status (0 if rt.errors is zero)
75c5a2c9376e Merged revisions 66174-66175,66177 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
141 return int(bool(rt.errors))