[Python-checkins] python/dist/src/Tools/modulator Tkextra.py, 1.3, 1.4 genmodule.py, 1.5, 1.6 modulator.py, 1.11, 1.12 varsubst.py, 1.4, 1.5

Sun Jul 18 08:02:07 CEST 2004

Update of /cvsroot/python/python/dist/src/Tools/modulator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29862/modulator
Modified Files:
	Tkextra.py genmodule.py modulator.py varsubst.py 
Log Message:
Whitespace normalization, via reindent.py.
Index: Tkextra.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/modulator/Tkextra.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Tkextra.py	10 Apr 1998 19:15:22 -0000	1.3
--- Tkextra.py	18 Jul 2004 06:02:04 -0000	1.4
***************
*** 106,110 ****
 'text': text,
 'font': '-Adobe-Times-Medium-R-Normal-*-180-*',
! Pack: {'side': 'left', 
 'fill': 'both',
 'padx': '3m', 'pady': '3m'}})
--- 106,110 ----
 'text': text,
 'font': '-Adobe-Times-Medium-R-Normal-*-180-*',
! Pack: {'side': 'left',
 'fill': 'both',
 'padx': '3m', 'pady': '3m'}})
***************
*** 188,192 ****
 i = strdialog(mainWidget, 'Question', str, '', 0)
 return i
! 
 # The rest is the test program.
 
--- 188,192 ----
 i = strdialog(mainWidget, 'Question', str, '', 0)
 return i
! 
 # The rest is the test program.
 
Index: genmodule.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/modulator/genmodule.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** genmodule.py	11 Sep 2002 20:36:01 -0000	1.5
--- genmodule.py	18 Jul 2004 06:02:04 -0000	1.6
***************
*** 66,70 ****
 raise error, 'Template '+name+' not found for '+self._type+' '+ \
 self.name
! 
 class module(writer):
 _type = 'module'
--- 66,70 ----
 raise error, 'Template '+name+' not found for '+self._type+' '+ \
 self.name
! 
 class module(writer):
 _type = 'module'
***************
*** 117,121 ****
 if self.methodlist and not 'tp_getattr' in self.funclist:
 self.funclist.insert(0, 'tp_getattr')
! 
 for fn in FUNCLIST:
 setattr(self, fn, '0')
--- 117,121 ----
 if self.methodlist and not 'tp_getattr' in self.funclist:
 self.funclist.insert(0, 'tp_getattr')
! 
 for fn in FUNCLIST:
 setattr(self, fn, '0')
Index: modulator.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/modulator/modulator.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** modulator.py	12 Feb 2004 17:35:31 -0000	1.11
--- modulator.py	18 Jul 2004 06:02:04 -0000	1.12
***************
*** 50,54 ****
 rv.append(list.get(i))
 return rv
! 
 class UI:
 def __init__(self):
--- 50,54 ----
 rv.append(list.get(i))
 return rv
! 
 class UI:
 def __init__(self):
***************
*** 98,102 ****
 except oops:
 pass
! 
 def cb_save(self, *args):
 try:
--- 98,102 ----
 except oops:
 pass
! 
 def cb_save(self, *args):
 try:
***************
*** 178,187 ****
 Pack:{'side':'left',
 'padx':'0.5m'}})
! 
 def cb_delmethod(self, *args):
 list = self.method_list.curselection()
 for i in list:
 self.method_list.delete(i)
! 
 def cb_newobj(self, *arg):
 self.parent.objects.append(UI_object(self.parent))
--- 178,187 ----
 Pack:{'side':'left',
 'padx':'0.5m'}})
! 
 def cb_delmethod(self, *args):
 list = self.method_list.curselection()
 for i in list:
 self.method_list.delete(i)
! 
 def cb_newobj(self, *arg):
 self.parent.objects.append(UI_object(self.parent))
***************
*** 209,213 ****
 message('Method name not an identifier:\n'+n)
 raise oops
! 
 def gencode(self, name, objects):
 rv = ''
--- 209,213 ----
 message('Method name not an identifier:\n'+n)
 raise oops
! 
 def gencode(self, name, objects):
 rv = ''
***************
*** 227,231 ****
 rv = rv + '\n'
 return rv
! 
 object_number = 0
 
--- 227,231 ----
 rv = rv + '\n'
 return rv
! 
 object_number = 0
 
***************
*** 251,255 ****
 self.f4 = Frame(self.frame, {Pack:{'side':'top', 'pady':'0.5m',
 'fill':'x'}})
! 
 
 self.l1 = Label(self.f1, {'text':'Object:', Pack:{'side':'left',
--- 251,255 ----
 self.f4 = Frame(self.frame, {Pack:{'side':'top', 'pady':'0.5m',
 'fill':'x'}})
! 
 
 self.l1 = Label(self.f1, {'text':'Object:', Pack:{'side':'left',
***************
*** 306,310 ****
 'anchor':'w'}})
 self.types[i] = b
! 
 def cb_method(self, *arg):
 name = self.method_entry.get()
--- 306,310 ----
 'anchor':'w'}})
 self.types[i] = b
! 
 def cb_method(self, *arg):
 name = self.method_entry.get()
***************
*** 318,322 ****
 for i in list:
 self.method_list.delete(i)
! 
 def synchronize(self):
 n = self.name_entry.get()
--- 318,322 ----
 for i in list:
 self.method_list.delete(i)
! 
 def synchronize(self):
 n = self.name_entry.get()
***************
*** 338,342 ****
 self.f5.setvar(self.vpref+'tp_getattr', 1)
 pass
! 
 def gencode(self, name):
 rv = ''
--- 338,342 ----
 self.f5.setvar(self.vpref+'tp_getattr', 1)
 pass
! 
 def gencode(self, name):
 rv = ''
***************
*** 357,366 ****
 if self.f5.getvar(vname) == '1':
 fl.append(fn)
! 
 rv = rv + '%s.typelist = %r\n' % (name, fl)
 
 rv = rv + '\n'
 return rv
! 
 
 def main():
--- 357,366 ----
 if self.f5.getvar(vname) == '1':
 fl.append(fn)
! 
 rv = rv + '%s.typelist = %r\n' % (name, fl)
 
 rv = rv + '\n'
 return rv
! 
 
 def main():
***************
*** 380,383 ****
 sys.stderr.write('Usage: modulator [file]\n')
 sys.exit(1)
! 
 main()
--- 380,383 ----
 sys.stderr.write('Usage: modulator [file]\n')
 sys.exit(1)
! 
 main()
Index: varsubst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/modulator/varsubst.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** varsubst.py	11 Sep 2002 20:36:01 -0000	1.4
--- varsubst.py	18 Jul 2004 06:02:04 -0000	1.5
***************
*** 14,18 ****
 def useindent(self, onoff):
 self.do_useindent = onoff
! 
 def subst(self, s):
 rv = ''
--- 14,18 ----
 def useindent(self, onoff):
 self.do_useindent = onoff
! 
 def subst(self, s):
 rv = ''