cpython-lru_cache-weakref: Tools/scripts/pindent.py annotate

annotate Tools/scripts/pindent.py @ 80661:94de77bd0b4b 2.7

Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.

author	Andrew Svetlov <andrew.svetlov@gmail.com>
date	Thu, 29 Nov 2012 19:51:28 +0200
parents	97d7cd365dd5
children	f783db4a58ba

rev	line source
4573 73758db2f464 /usr/local/bin/python -> /usr/bin/env python Guido van Rossum <guido@python.org> parents: 1799 diff changeset	1 #! /usr/bin/env python
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	3 # This file contains a class and a main program that perform three
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4 # related (though complimentary) formatting operations on Python
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	5 # programs. When called as "pindent -c", it takes a valid Python
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6 # program as input and outputs a version augmented with block-closing
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	7 # comments. When called as "pindent -d", it assumes its input is a
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	8 # Python program with block-closing comments and outputs a commentless
797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	9 # version. When called as "pindent -r" it assumes its input is a
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	10 # Python program with block-closing comments but with its indentation
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	11 # messed up, and outputs a properly indented version.
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	13 # A "block-closing comment" is a comment of the form '# end <keyword>'
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	14 # where <keyword> is the keyword that opened the block. If the
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	15 # opening keyword is 'def' or 'class', the function or class name may
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	16 # be repeated in the block-closing comment as well. Here is an
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17 # example of a program fully augmented with block-closing comments:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	18
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	19 # def foobar(a, b):
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	20 # if a == b:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	21 # a = a+1
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	22 # elif a < b:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	23 # b = b-1
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	24 # if b > a: a = a-1
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	25 # # end if
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	26 # else:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	27 # print 'oops!'
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	28 # # end if
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	29 # # end def foobar
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	30
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31 # Note that only the last part of an if...elif...else... block needs a
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	32 # block-closing comment; the same is true for other compound
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33 # statements (e.g. try...except). Also note that "short-form" blocks
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	34 # like the second 'if' in the example must be closed as well;
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	35 # otherwise the 'else' in the example would be ambiguous (remember
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	36 # that indentation is not significant when interpreting block-closing
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	37 # comments).
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	38
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	39 # The operations are idempotent (i.e. applied to their own output
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	40 # they yield an identical result). Running first "pindent -c" and
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	41 # then "pindent -r" on a valid Python program produces a program that
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	42 # is semantically identical to the input (though its indentation may
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	43 # be different). Running "pindent -e" on that output produces a
797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	44 # program that only differs from the original in indentation.
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	45
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46 # Other options:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47 # -s stepsize: set the indentation step size (default 8)
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	48 # -t tabsize : set the number of spaces a tab character is worth (default 8)
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	49 # -e : expand TABs into spaces
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	50 # file ... : input file(s) (default standard input)
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	51 # The results always go to standard output
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	52
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	53 # Caveats:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	54 # - comments ending in a backslash will be mistaken for continued lines
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	55 # - continuations using backslash are always left unchanged
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	56 # - continuations inside parentheses are not extra indented by -r
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	57 # but must be indented for -c to work correctly (this breaks
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	58 # idempotency!)
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	59 # - continued lines inside triple-quoted strings are totally garbled
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	60
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	61 # Secret feature:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62 # - On input, a block may also be closed with an "end statement" --
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	63 # this is a block-closing comment without the '#' sign.
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	64
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	65 # Possible improvements:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	66 # - check syntax based on transitions in 'next' table
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	67 # - better error reporting
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	68 # - better error recovery
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	69 # - check identifier after class/def
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	70
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	71 # The following wishes need a more complete tokenization of the source:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	72 # - Don't get fooled by comments ending in backslash
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	73 # - reindent continuation lines indicated by backslash
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	74 # - handle continuation lines inside parentheses/braces/brackets
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	75 # - handle triple quoted strings spanning lines
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	76 # - realign comments
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	77 # - optionally do much more thorough reformatting, a la C indent
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	78
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	79 # Defaults
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	80 STEPSIZE = 8
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	81 TABSIZE = 8
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	82 EXPANDTABS = 0
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	83
8531 18a9289df99a Translated to use re instead of regex. Also replaced one use of Guido van Rossum <guido@python.org> parents: 4573 diff changeset	84 import re
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	85 import sys
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	86
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	87 next = {}
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	88 next['if'] = next['elif'] = 'elif', 'else', 'end'
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	89 next['while'] = next['for'] = 'else', 'end'
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	90 next['try'] = 'except', 'finally'
56830 97d7cd365dd5 Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from Georg Brandl <georg@python.org> parents: 45468 diff changeset	91 next['except'] = 'except', 'else', 'finally', 'end'
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	92 next['else'] = next['finally'] = next['def'] = next['class'] = 'end'
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	93 next['end'] = ()
56830 97d7cd365dd5 Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from Georg Brandl <georg@python.org> parents: 45468 diff changeset	94 start = 'if', 'while', 'for', 'try', 'with', 'def', 'class'
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	95
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	96 class PythonIndenter:
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	97
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	98 def __init__(self, fpi = sys.stdin, fpo = sys.stdout,
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	99 indentsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	100 self.fpi = fpi
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	101 self.fpo = fpo
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	102 self.indentsize = indentsize
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	103 self.tabsize = tabsize
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	104 self.lineno = 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	105 self.expandtabs = expandtabs
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	106 self._write = fpo.write
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	107 self.kwprog = re.compile(
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	108 r'^\s*(?P<kw>[a-z]+)'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	109 r'(\s+(?P<id>[a-zA-Z_]\w*))?'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	110 r'[^\w]')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	111 self.endprog = re.compile(
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	112 r'^\s#?\send\s+(?P<kw>[a-z]+)'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	113 r'(\s+(?P<id>[a-zA-Z_]\w*))?'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	114 r'[^\w]')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	115 self.wsprog = re.compile(r'^[ \t]*')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	116 # end def __init__
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	117
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	118 def write(self, line):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	119 if self.expandtabs:
25219 8a7a2f1f88f0 Apply diff2.txt from SF patch http://www.python.org/sf/572113 Walter Dörwald <walter@livinglogic.de> parents: 15930 diff changeset	120 self._write(line.expandtabs(self.tabsize))
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	121 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	122 self._write(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	123 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	124 # end def write
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	125
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	126 def readline(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	127 line = self.fpi.readline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	128 if line: self.lineno = self.lineno + 1
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	129 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	130 return line
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	131 # end def readline
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	132
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	133 def error(self, fmt, *args):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	134 if args: fmt = fmt % args
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	135 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	136 sys.stderr.write('Error at line %d: %s\n' % (self.lineno, fmt))
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	137 self.write('### %s ###\n' % fmt)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	138 # end def error
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	139
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	140 def getline(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	141 line = self.readline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	142 while line[-2:] == '\\\n':
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	143 line2 = self.readline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	144 if not line2: break
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	145 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	146 line = line + line2
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	147 # end while
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	148 return line
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	149 # end def getline
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	150
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	151 def putline(self, line, indent = None):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	152 if indent is None:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	153 self.write(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	154 return
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	155 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	156 tabs, spaces = divmod(indent*self.indentsize, self.tabsize)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	157 i = 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	158 m = self.wsprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	159 if m: i = m.end()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	160 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	161 self.write('\t'tabs + ' 'spaces + line[i:])
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	162 # end def putline
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	163
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	164 def reformat(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	165 stack = []
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	166 while 1:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	167 line = self.getline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	168 if not line: break # EOF
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	169 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	170 m = self.endprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	171 if m:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	172 kw = 'end'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	173 kw2 = m.group('kw')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	174 if not stack:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	175 self.error('unexpected end')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	176 elif stack[-1][0] != kw2:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	177 self.error('unmatched end')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	178 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	179 del stack[-1:]
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	180 self.putline(line, len(stack))
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	181 continue
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	182 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	183 m = self.kwprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	184 if m:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	185 kw = m.group('kw')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	186 if kw in start:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	187 self.putline(line, len(stack))
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	188 stack.append((kw, kw))
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	189 continue
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	190 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	191 if next.has_key(kw) and stack:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	192 self.putline(line, len(stack)-1)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	193 kwa, kwb = stack[-1]
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	194 stack[-1] = kwa, kw
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	195 continue
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	196 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	197 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	198 self.putline(line, len(stack))
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	199 # end while
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	200 if stack:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	201 self.error('unterminated keywords')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	202 for kwa, kwb in stack:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	203 self.write('\t%s\n' % kwa)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	204 # end for
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	205 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	206 # end def reformat
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	207
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	208 def delete(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	209 begin_counter = 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	210 end_counter = 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	211 while 1:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	212 line = self.getline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	213 if not line: break # EOF
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	214 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	215 m = self.endprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	216 if m:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	217 end_counter = end_counter + 1
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	218 continue
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	219 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	220 m = self.kwprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	221 if m:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	222 kw = m.group('kw')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	223 if kw in start:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	224 begin_counter = begin_counter + 1
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	225 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	226 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	227 self.putline(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	228 # end while
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	229 if begin_counter - end_counter < 0:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	230 sys.stderr.write('Warning: input contained more end tags than expected\n')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	231 elif begin_counter - end_counter > 0:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	232 sys.stderr.write('Warning: input contained less end tags than expected\n')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	233 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	234 # end def delete
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	235
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	236 def complete(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	237 self.indentsize = 1
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	238 stack = []
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	239 todo = []
35147 99309802d490 backport bug [ 1072853 ] thisid not intialized in pindent.py script Georg Brandl <georg@python.org> parents: 29107 diff changeset	240 thisid = ''
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	241 current, firstkw, lastkw, topid = 0, '', '', ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	242 while 1:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	243 line = self.getline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	244 i = 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	245 m = self.wsprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	246 if m: i = m.end()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	247 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	248 m = self.endprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	249 if m:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	250 thiskw = 'end'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	251 endkw = m.group('kw')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	252 thisid = m.group('id')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	253 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	254 m = self.kwprog.match(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	255 if m:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	256 thiskw = m.group('kw')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	257 if not next.has_key(thiskw):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	258 thiskw = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	259 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	260 if thiskw in ('def', 'class'):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	261 thisid = m.group('id')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	262 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	263 thisid = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	264 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	265 elif line[i:i+1] in ('\n', '#'):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	266 todo.append(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	267 continue
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	268 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	269 thiskw = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	270 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	271 # end if
25219 8a7a2f1f88f0 Apply diff2.txt from SF patch http://www.python.org/sf/572113 Walter Dörwald <walter@livinglogic.de> parents: 15930 diff changeset	272 indent = len(line[:i].expandtabs(self.tabsize))
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	273 while indent < current:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	274 if firstkw:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	275 if topid:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	276 s = '# end %s %s\n' % (
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	277 firstkw, topid)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	278 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	279 s = '# end %s\n' % firstkw
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	280 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	281 self.putline(s, current)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	282 firstkw = lastkw = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	283 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	284 current, firstkw, lastkw, topid = stack[-1]
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	285 del stack[-1]
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	286 # end while
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	287 if indent == current and firstkw:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	288 if thiskw == 'end':
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	289 if endkw != firstkw:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	290 self.error('mismatched end')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	291 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	292 firstkw = lastkw = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	293 elif not thiskw or thiskw in start:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	294 if topid:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	295 s = '# end %s %s\n' % (
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	296 firstkw, topid)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	297 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	298 s = '# end %s\n' % firstkw
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	299 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	300 self.putline(s, current)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	301 firstkw = lastkw = topid = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	302 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	303 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	304 if indent > current:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	305 stack.append((current, firstkw, lastkw, topid))
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	306 if thiskw and thiskw not in start:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	307 # error
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	308 thiskw = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	309 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	310 current, firstkw, lastkw, topid = \
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	311 indent, thiskw, thiskw, thisid
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	312 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	313 if thiskw:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	314 if thiskw in start:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	315 firstkw = lastkw = thiskw
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	316 topid = thisid
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	317 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	318 lastkw = thiskw
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	319 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	320 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	321 for l in todo: self.write(l)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	322 # end for
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	323 todo = []
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	324 if not line: break
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	325 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	326 self.write(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	327 # end while
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	328 # end def complete
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	329
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	330 # end class PythonIndenter
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	331
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	332 # Simplified user interface
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	333 # - xxx_filter(input, output): read and write file objects
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	334 # - xxx_string(s): take and return string object
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	335 # - xxx_file(filename): process file in place, return true iff changed
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	336
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	337 def complete_filter(input = sys.stdin, output = sys.stdout,
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	338 stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	339 pi = PythonIndenter(input, output, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	340 pi.complete()
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	341 # end def complete_filter
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	342
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	343 def delete_filter(input= sys.stdin, output = sys.stdout,
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	344 stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	345 pi = PythonIndenter(input, output, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	346 pi.delete()
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	347 # end def delete_filter
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	348
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	349 def reformat_filter(input = sys.stdin, output = sys.stdout,
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	350 stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	351 pi = PythonIndenter(input, output, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	352 pi.reformat()
13105 fd8467d1375d Running the program through itself reveals that one end tag was Guido van Rossum <guido@python.org> parents: 13104 diff changeset	353 # end def reformat_filter
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	354
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	355 class StringReader:
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	356 def __init__(self, buf):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	357 self.buf = buf
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	358 self.pos = 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	359 self.len = len(self.buf)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	360 # end def __init__
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	361 def read(self, n = 0):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	362 if n <= 0:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	363 n = self.len - self.pos
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	364 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	365 n = min(n, self.len - self.pos)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	366 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	367 r = self.buf[self.pos : self.pos + n]
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	368 self.pos = self.pos + n
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	369 return r
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	370 # end def read
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	371 def readline(self):
25219 8a7a2f1f88f0 Apply diff2.txt from SF patch http://www.python.org/sf/572113 Walter Dörwald <walter@livinglogic.de> parents: 15930 diff changeset	372 i = self.buf.find('\n', self.pos)
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	373 return self.read(i + 1 - self.pos)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	374 # end def readline
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	375 def readlines(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	376 lines = []
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	377 line = self.readline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	378 while line:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	379 lines.append(line)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	380 line = self.readline()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	381 # end while
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	382 return lines
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	383 # end def readlines
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	384 # seek/tell etc. are left as an exercise for the reader
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	385 # end class StringReader
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	386
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	387 class StringWriter:
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	388 def __init__(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	389 self.buf = ''
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	390 # end def __init__
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	391 def write(self, s):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	392 self.buf = self.buf + s
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	393 # end def write
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	394 def getvalue(self):
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	395 return self.buf
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	396 # end def getvalue
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	397 # end class StringWriter
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	398
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	399 def complete_string(source, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	400 input = StringReader(source)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	401 output = StringWriter()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	402 pi = PythonIndenter(input, output, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	403 pi.complete()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	404 return output.getvalue()
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	405 # end def complete_string
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	406
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	407 def delete_string(source, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	408 input = StringReader(source)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	409 output = StringWriter()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	410 pi = PythonIndenter(input, output, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	411 pi.delete()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	412 return output.getvalue()
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	413 # end def delete_string
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	414
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	415 def reformat_string(source, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	416 input = StringReader(source)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	417 output = StringWriter()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	418 pi = PythonIndenter(input, output, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	419 pi.reformat()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	420 return output.getvalue()
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	421 # end def reformat_string
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	422
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	423 def complete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	424 source = open(filename, 'r').read()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	425 result = complete_string(source, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	426 if source == result: return 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	427 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	428 import os
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	429 try: os.rename(filename, filename + '~')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	430 except os.error: pass
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	431 # end try
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	432 f = open(filename, 'w')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	433 f.write(result)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	434 f.close()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	435 return 1
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	436 # end def complete_file
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	437
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	438 def delete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	439 source = open(filename, 'r').read()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	440 result = delete_string(source, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	441 if source == result: return 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	442 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	443 import os
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	444 try: os.rename(filename, filename + '~')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	445 except os.error: pass
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	446 # end try
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	447 f = open(filename, 'w')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	448 f.write(result)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	449 f.close()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	450 return 1
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	451 # end def delete_file
13104 797acf3ffd26 Peter Schneider-Kamp: Guido van Rossum <guido@python.org> parents: 8531 diff changeset	452
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	453 def reformat_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	454 source = open(filename, 'r').read()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	455 result = reformat_string(source, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	456 if source == result: return 0
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	457 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	458 import os
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	459 try: os.rename(filename, filename + '~')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	460 except os.error: pass
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	461 # end try
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	462 f = open(filename, 'w')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	463 f.write(result)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	464 f.close()
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	465 return 1
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	466 # end def reformat_file
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	467
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	468 # Test program when called as a script
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	469
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	470 usage = """
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	471 usage: pindent (-c\|-d\|-r) [-s stepsize] [-t tabsize] [-e] [file] ...
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	472 -c : complete a correctly indented program (add #end directives)
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	473 -d : delete #end directives
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	474 -r : reformat a completed program (use #end directives)
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	475 -s stepsize: indentation step (default %(STEPSIZE)d)
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	476 -t tabsize : the worth in spaces of a tab (default %(TABSIZE)d)
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	477 -e : expand TABs into spaces (defailt OFF)
1662 14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	478 [file] ... : files are changed in place, with backups in file~
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	479 If no files are specified or a single - is given,
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	480 the program acts as a filter (reads stdin, writes stdout).
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	481 """ % vars()
14b03418c90f Added convenience functions {complete,reformat}_{filter,string,file}. Guido van Rossum <guido@python.org> parents: 1654 diff changeset	482
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	483 def error_both(op1, op2):
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	484 sys.stderr.write('Error: You can not specify both '+op1+' and -'+op2[0]+' at the same time\n')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	485 sys.stderr.write(usage)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	486 sys.exit(2)
13537 b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	487 # end def error_both
b9f9da1a3fc4 add expandtabs command (-e) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13105 diff changeset	488
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	489 def test():
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	490 import getopt
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	491 try:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	492 opts, args = getopt.getopt(sys.argv[1:], 'cdrs:t:e')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	493 except getopt.error, msg:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	494 sys.stderr.write('Error: %s\n' % msg)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	495 sys.stderr.write(usage)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	496 sys.exit(2)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	497 # end try
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	498 action = None
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	499 stepsize = STEPSIZE
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	500 tabsize = TABSIZE
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	501 expandtabs = EXPANDTABS
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	502 for o, a in opts:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	503 if o == '-c':
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	504 if action: error_both(o, action)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	505 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	506 action = 'complete'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	507 elif o == '-d':
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	508 if action: error_both(o, action)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	509 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	510 action = 'delete'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	511 elif o == '-r':
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	512 if action: error_both(o, action)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	513 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	514 action = 'reformat'
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	515 elif o == '-s':
25219 8a7a2f1f88f0 Apply diff2.txt from SF patch http://www.python.org/sf/572113 Walter Dörwald <walter@livinglogic.de> parents: 15930 diff changeset	516 stepsize = int(a)
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	517 elif o == '-t':
25219 8a7a2f1f88f0 Apply diff2.txt from SF patch http://www.python.org/sf/572113 Walter Dörwald <walter@livinglogic.de> parents: 15930 diff changeset	518 tabsize = int(a)
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	519 elif o == '-e':
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	520 expandtabs = 1
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	521 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	522 # end for
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	523 if not action:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	524 sys.stderr.write(
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	525 'You must specify -c(omplete), -d(elete) or -r(eformat)\n')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	526 sys.stderr.write(usage)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	527 sys.exit(2)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	528 # end if
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	529 if not args or args == ['-']:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	530 action = eval(action + '_filter')
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	531 action(sys.stdin, sys.stdout, stepsize, tabsize, expandtabs)
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	532 else:
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	533 action = eval(action + '_file')
29107 93c92f20b6bf Fix use of 'file' as a variable name. Andrew M. Kuchling <amk@amk.ca> parents: 25219 diff changeset	534 for filename in args:
93c92f20b6bf Fix use of 'file' as a variable name. Andrew M. Kuchling <amk@amk.ca> parents: 25219 diff changeset	535 action(filename, stepsize, tabsize, expandtabs)
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	536 # end for
14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	537 # end if
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	538 # end def test
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	539
007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	540 if __name__ == '__main__':
15930 14a27acc755a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 13537 diff changeset	541 test()
1632 007adf01543c Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	542 # end if

Mercurial > cpython-lru_cache-weakref

annotate Tools/scripts/pindent.py @ 80661:94de77bd0b4b 2.7