[Python-checkins] cpython (merge default -> default): Merge fix for reindent.py

[jason.coombs]

http://hg.python.org/cpython/rev/5ba0a479c519
changeset:   71597:5ba0a479c519
parent:      71595:43c41e19527a
parent:      71596:2547f7965733
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Fri Jul 29 09:32:25 2011 -0400
summary:
  Merge fix for reindent.py

files:
  Tools/scripts/reindent.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Tools/scripts/reindent.py b/Tools/scripts/reindent.py
--- a/Tools/scripts/reindent.py
+++ b/Tools/scripts/reindent.py
@@ -52,6 +52,8 @@
 recurse = False
 dryrun = False
 makebackup = True
+"A specified newline to be used in the output (set by --newline option)"
+spec_newline = None
 
 
 def usage(msg=None):
@@ -64,11 +66,9 @@
     sys.stderr.write(" ".join(str(arg) for arg in args))
     sys.stderr.write("\n")
 
-
 def main():
     import getopt
     global verbose, recurse, dryrun, makebackup, spec_newline
-    spec_newline = None
     try:
         opts, args = getopt.getopt(sys.argv[1:], "drnvh",
             ["dryrun", "recurse", "nobackup", "verbose", "newline=", "help"])

-- 
Repository URL: http://hg.python.org/cpython