[Python-checkins] python/dist/src/Tools/scripts db2pickle.py,1.2,1.3 pickle2db.py,1.3,1.4 trace.py,1.13,1.14

2003年4月24日 09:02:58 -0700

Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv21022/Tools/scripts
Modified Files:
	db2pickle.py pickle2db.py trace.py 
Log Message:
Whitespace normalization.
Index: db2pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/db2pickle.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** db2pickle.py	3 Feb 2003 15:29:34 -0000	1.2
--- db2pickle.py	24 Apr 2003 16:02:54 -0000	1.3
***************
*** 104,108 ****
 sys.stderr.write("Check for format or version mismatch.\n")
 return 1
! 
 for k in db.keys():
 pickle.dump((k, db[k]), pfile, 1==1)
--- 104,108 ----
 sys.stderr.write("Check for format or version mismatch.\n")
 return 1
! 
 for k in db.keys():
 pickle.dump((k, db[k]), pfile, 1==1)
Index: pickle2db.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pickle2db.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pickle2db.py	7 Mar 2003 00:47:40 -0000	1.3
--- pickle2db.py	24 Apr 2003 16:02:54 -0000	1.4
***************
*** 38,42 ****
 
 def usage():
! sys.stderr.write(__doc__ % globals())
 
 def main(args):
--- 38,42 ----
 
 def usage():
! sys.stderr.write(__doc__ % globals())
 
 def main(args):
Index: trace.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/trace.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** trace.py	3 Feb 2003 06:34:22 -0000	1.13
--- trace.py	24 Apr 2003 16:02:54 -0000	1.14
***************
*** 147,151 ****
 class CoverageResults:
 def __init__(self, counts=None, calledfuncs=None, infile=None,
! outfile=None): 
 self.counts = counts
 if self.counts is None:
--- 147,151 ----
 class CoverageResults:
 def __init__(self, counts=None, calledfuncs=None, infile=None,
! outfile=None):
 self.counts = counts
 if self.counts is None:
***************
*** 165,169 ****
 # backwards compatibility for old trace.py after
 # Zooko touched it but before calledfuncs --Zooko
! # 2001年10月24日 
 self.update(self.__class__(thingie))
 elif type(thingie) is types.TupleType and len(thingie) == 2:
--- 165,169 ----
 # backwards compatibility for old trace.py after
 # Zooko touched it but before calledfuncs --Zooko
! # 2001年10月24日
 self.update(self.__class__(thingie))
 elif type(thingie) is types.TupleType and len(thingie) == 2:
***************
*** 174,178 ****
 except pickle.UnpicklingError:
 # backwards compatibility for old trace.py before
! # Zooko touched it --Zooko 2001年10月24日 
 self.update(self.__class__(marshal.load(open(self.infile))))
 
--- 174,178 ----
 except pickle.UnpicklingError:
 # backwards compatibility for old trace.py before
! # Zooko touched it --Zooko 2001年10月24日
 self.update(self.__class__(marshal.load(open(self.infile))))
 
***************
*** 188,192 ****
 # backwards compatibility for abortive attempt to
 # stuff calledfuncs into self.counts, by Zooko
! # --Zooko 2001年10月24日 
 counts[key] = counts.get(key, 0) + other_counts[key]
 
--- 188,192 ----
 # backwards compatibility for abortive attempt to
 # stuff calledfuncs into self.counts, by Zooko
! # --Zooko 2001年10月24日
 counts[key] = counts.get(key, 0) + other_counts[key]
 
***************
*** 407,422 ****
 """
 @param count true iff it should count number of times each
! line is executed 
 @param trace true iff it should print out each line that is
! being counted 
 @param countfuncs true iff it should just output a list of
 (filename, modulename, funcname,) for functions
 that were called at least once; This overrides
! `count' and `trace' 
 @param ignoremods a list of the names of modules to ignore
 @param ignoredirs a list of the names of directories to ignore
! all of the (recursive) contents of 
 @param infile file from which to read stored counts to be
! added into the results 
 @param outfile file in which to write the results
 """
--- 407,422 ----
 """
 @param count true iff it should count number of times each
! line is executed
 @param trace true iff it should print out each line that is
! being counted
 @param countfuncs true iff it should just output a list of
 (filename, modulename, funcname,) for functions
 that were called at least once; This overrides
! `count' and `trace'
 @param ignoremods a list of the names of modules to ignore
 @param ignoredirs a list of the names of directories to ignore
! all of the (recursive) contents of
 @param infile file from which to read stored counts to be
! added into the results
 @param outfile file in which to write the results
 """
***************
*** 517,533 ****
 # `getfilename(frame)' to use in place of the presumably
 # heavier `getframeinfo()'. --Zooko 2001年10月14日
! 
 filename, lineno, funcname, context, lineindex = \
 inspect.getframeinfo(frame, 1)
 key = filename, lineno
 self.counts[key] = self.counts.get(key, 0) + 1
! 
 # XXX not convinced that this memoizing is a performance
 # win -- I don't know enough about Python guts to tell.
 # --Zooko 2001年10月14日
! 
 bname = self.pathtobasename.get(filename)
 if bname is None:
! 
 # Using setdefault faster than two separate lines?
 # --Zooko 2001年10月14日
--- 517,533 ----
 # `getfilename(frame)' to use in place of the presumably
 # heavier `getframeinfo()'. --Zooko 2001年10月14日
! 
 filename, lineno, funcname, context, lineindex = \
 inspect.getframeinfo(frame, 1)
 key = filename, lineno
 self.counts[key] = self.counts.get(key, 0) + 1
! 
 # XXX not convinced that this memoizing is a performance
 # win -- I don't know enough about Python guts to tell.
 # --Zooko 2001年10月14日
! 
 bname = self.pathtobasename.get(filename)
 if bname is None:
! 
 # Using setdefault faster than two separate lines?
 # --Zooko 2001年10月14日
***************
*** 554,558 ****
 filename, lineno, funcname, context, lineindex = \
 inspect.getframeinfo(frame)
! 
 # XXX not convinced that this memoizing is a performance
 # win -- I don't know enough about Python guts to tell.
--- 554,558 ----
 filename, lineno, funcname, context, lineindex = \
 inspect.getframeinfo(frame)
! 
 # XXX not convinced that this memoizing is a performance
 # win -- I don't know enough about Python guts to tell.