[Python-checkins] CVS: python/dist/src/Tools/scripts eptags.py,1.7,1.8 parseentities.py,1.1,1.2 trace.py,1.1,1.2
Jeremy Hylton
python-dev@python.org
Sun, 17 Sep 2000 18:46:06 -0700
Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23123
Modified Files:
eptags.py parseentities.py trace.py
Log Message:
satisfy the tabnanny
Index: eptags.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/eptags.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** eptags.py 2000/09/01 13:41:37 1.7
--- eptags.py 2000/09/18 01:46:01 1.8
***************
*** 25,32 ****
"""Append tags found in file named 'file' to the open file 'outfp'"""
try:
! fp = open(file, 'r')
except:
! sys.stderr.write('Cannot open %s\n'%file)
! return
charno = 0
lineno = 0
--- 25,32 ----
"""Append tags found in file named 'file' to the open file 'outfp'"""
try:
! fp = open(file, 'r')
except:
! sys.stderr.write('Cannot open %s\n'%file)
! return
charno = 0
lineno = 0
***************
*** 34,54 ****
size = 0
while 1:
! line = fp.readline()
! if not line: break
! lineno = lineno + 1
! m = matcher.search(line)
! if m:
! tag = m.group(0) + '\177%d,%d\n'%(lineno,charno)
! tags.append(tag)
! size = size + len(tag)
! charno = charno + len(line)
outfp.write('\f\n%s,%d\n'%(file,size))
for tag in tags:
! outfp.write(tag)
def main():
outfp = open('TAGS', 'w')
for file in sys.argv[1:]:
! treat_file(file, outfp)
if __name__=="__main__":
--- 34,55 ----
size = 0
while 1:
! line = fp.readline()
! if not line:
! break
! lineno = lineno + 1
! m = matcher.search(line)
! if m:
! tag = m.group(0) + '\177%d,%d\n'%(lineno,charno)
! tags.append(tag)
! size = size + len(tag)
! charno = charno + len(line)
outfp.write('\f\n%s,%d\n'%(file,size))
for tag in tags:
! outfp.write(tag)
def main():
outfp = open('TAGS', 'w')
for file in sys.argv[1:]:
! treat_file(file, outfp)
if __name__=="__main__":
Index: parseentities.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/parseentities.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** parseentities.py 1999/08/19 16:00:41 1.1
--- parseentities.py 2000/09/18 01:46:01 1.2
***************
*** 22,34 ****
pos = 0
if endpos is None:
! endpos = len(text)
d = {}
while 1:
! m = entityRE.search(text,pos,endpos)
! if not m:
! break
! name,charcode,comment = m.groups()
! d[name] = charcode,comment
! pos = m.end()
return d
--- 22,34 ----
pos = 0
if endpos is None:
! endpos = len(text)
d = {}
while 1:
! m = entityRE.search(text,pos,endpos)
! if not m:
! break
! name,charcode,comment = m.groups()
! d[name] = charcode,comment
! pos = m.end()
return d
***************
*** 39,63 ****
items.sort()
for name,(charcode,comment) in items:
! if charcode[:2] == '&#':
! code = int(charcode[2:-1])
! if code < 256:
! charcode = "'\%o'" % code
! else:
! charcode = repr(charcode)
! else:
! charcode = repr(charcode)
! comment = TextTools.collapse(comment)
! f.write(" '%s':\t%s, \t# %s\n" % (name,charcode,comment))
f.write('\n}\n')
if __name__ == '__main__':
if len(sys.argv) > 1:
! infile = open(sys.argv[1])
else:
! infile = sys.stdin
if len(sys.argv) > 2:
! outfile = open(sys.argv[2],'w')
else:
! outfile = sys.stdout
text = infile.read()
defs = parse(text)
--- 39,63 ----
items.sort()
for name,(charcode,comment) in items:
! if charcode[:2] == '&#':
! code = int(charcode[2:-1])
! if code < 256:
! charcode = "'\%o'" % code
! else:
! charcode = repr(charcode)
! else:
! charcode = repr(charcode)
! comment = TextTools.collapse(comment)
! f.write(" '%s':\t%s, \t# %s\n" % (name,charcode,comment))
f.write('\n}\n')
if __name__ == '__main__':
if len(sys.argv) > 1:
! infile = open(sys.argv[1])
else:
! infile = sys.stdin
if len(sys.argv) > 2:
! outfile = open(sys.argv[2],'w')
else:
! outfile = sys.stdout
text = infile.read()
defs = parse(text)
Index: trace.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/trace.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** trace.py 2000/08/03 19:26:21 1.1
--- trace.py 2000/09/18 01:46:01 1.2
***************
*** 100,154 ****
class Ignore:
def __init__(self, modules = None, dirs = None):
! self._mods = modules or []
! self._dirs = dirs or []
! self._ignore = { '<string>': 1 }
def names(self, filename, modulename):
! if self._ignore.has_key(modulename):
! return self._ignore[modulename]
! # haven't seen this one before, so see if the module name is
! # on the ignore list. Need to take some care since ignoring
! # "cmp" musn't mean ignoring "cmpcache" but ignoring
! # "Spam" must also mean ignoring "Spam.Eggs".
! for mod in self._mods:
! if mod == modulename: # Identical names, so ignore
! self._ignore[modulename] = 1
! return 1
! # check if the module is a proper submodule of something on
! # the ignore list
! n = len(mod)
! # (will not overflow since if the first n characters are the
! # same and the name has not already occured, then the size
! # of "name" is greater than that of "mod")
! if mod == modulename[:n] and modulename[n] == '.':
! self._ignore[modulename] = 1
! return 1
!
! # Now check that __file__ isn't in one of the directories
! if filename is None:
! # must be a built-in, so we must ignore
! self._ignore[modulename] = 1
! return 1
!
! # Ignore a file when it contains one of the ignorable paths
! for d in self._dirs:
! # The '+ os.sep' is to ensure that d is a parent directory,
! # as compared to cases like:
! # d = "/usr/local"
! # filename = "/usr/local.py"
! # or
! # d = "/usr/local.py"
! # filename = "/usr/local.py"
! if string.find(filename, d + os.sep) == 0:
! self._ignore[modulename] = 1
! return 1
!
! # Tried the different ways, so we don't ignore this module
! self._ignore[modulename] = 0
! return 0
!
def run(trace, cmd):
--- 100,153 ----
class Ignore:
def __init__(self, modules = None, dirs = None):
! self._mods = modules or []
! self._dirs = dirs or []
! self._ignore = { '<string>': 1 }
def names(self, filename, modulename):
! if self._ignore.has_key(modulename):
! return self._ignore[modulename]
! # haven't seen this one before, so see if the module name is
! # on the ignore list. Need to take some care since ignoring
! # "cmp" musn't mean ignoring "cmpcache" but ignoring
! # "Spam" must also mean ignoring "Spam.Eggs".
! for mod in self._mods:
! if mod == modulename: # Identical names, so ignore
! self._ignore[modulename] = 1
! return 1
! # check if the module is a proper submodule of something on
! # the ignore list
! n = len(mod)
! # (will not overflow since if the first n characters are the
! # same and the name has not already occured, then the size
! # of "name" is greater than that of "mod")
! if mod == modulename[:n] and modulename[n] == '.':
! self._ignore[modulename] = 1
! return 1
!
! # Now check that __file__ isn't in one of the directories
! if filename is None:
! # must be a built-in, so we must ignore
! self._ignore[modulename] = 1
! return 1
!
! # Ignore a file when it contains one of the ignorable paths
! for d in self._dirs:
! # The '+ os.sep' is to ensure that d is a parent directory,
! # as compared to cases like:
! # d = "/usr/local"
! # filename = "/usr/local.py"
! # or
! # d = "/usr/local.py"
! # filename = "/usr/local.py"
! if string.find(filename, d + os.sep) == 0:
! self._ignore[modulename] = 1
! return 1
!
! # Tried the different ways, so we don't ignore this module
! self._ignore[modulename] = 0
! return 0
def run(trace, cmd):
***************
*** 157,163 ****
sys.settrace(trace)
try:
! exec cmd in dict, dict
finally:
! sys.settrace(None)
def runctx(trace, cmd, globals=None, locals=None):
--- 156,162 ----
sys.settrace(trace)
try:
! exec cmd in dict, dict
finally:
! sys.settrace(None)
def runctx(trace, cmd, globals=None, locals=None):
***************
*** 166,172 ****
sys.settrace(trace)
try:
! exec cmd in dict, dict
finally:
! sys.settrace(None)
def runfunc(trace, func, *args, **kw):
--- 165,171 ----
sys.settrace(trace)
try:
! exec cmd in dict, dict
finally:
! sys.settrace(None)
def runfunc(trace, func, *args, **kw):
***************
*** 174,180 ****
sys.settrace(trace)
try:
! result = apply(func, args, kw)
finally:
! sys.settrace(None)
return result
--- 173,179 ----
sys.settrace(trace)
try:
! result = apply(func, args, kw)
finally:
! sys.settrace(None)
return result
***************
*** 182,206 ****
class CoverageResults:
def __init__(self, counts = {}, modules = {}):
! self.counts = counts.copy() # map (filename, lineno) to count
! self.modules = modules.copy() # map filenames to modules
def update(self, other):
! """Merge in the data from another CoverageResults"""
! counts = self.counts
! other_counts = other.counts
! modules = self.modules
! other_modules = other.modules
!
! for key in other_counts.keys():
! counts[key] = counts.get(key, 0) + other_counts[key]
!
! for key in other_modules.keys():
! if modules.has_key(key):
! # make sure they point to the same file
! assert modules[key] == other_modules[key], \
! "Strange! filename %s has two different module names" % \
! (key, modules[key], other_module[key])
! else:
! modules[key] = other_modules[key]
# Given a code string, return the SET_LINENO information
--- 181,205 ----
class CoverageResults:
def __init__(self, counts = {}, modules = {}):
! self.counts = counts.copy() # map (filename, lineno) to count
! self.modules = modules.copy() # map filenames to modules
def update(self, other):
! """Merge in the data from another CoverageResults"""
! counts = self.counts
! other_counts = other.counts
! modules = self.modules
! other_modules = other.modules
!
! for key in other_counts.keys():
! counts[key] = counts.get(key, 0) + other_counts[key]
!
! for key in other_modules.keys():
! if modules.has_key(key):
! # make sure they point to the same file
! assert modules[key] == other_modules[key], \
! "Strange! filename %s has two different module names" % \
! (key, modules[key], other_module[key])
! else:
! modules[key] = other_modules[key]
# Given a code string, return the SET_LINENO information
***************
*** 216,234 ****
prev_lineno = 0
while i < n:
! c = co_code[i]
! op = ord(c)
! if op == dis.SET_LINENO:
! if prev_op == op:
! # two SET_LINENO in a row, so the previous didn't
! # indicate anything. This occurs with triple
! # quoted strings (?). Remove the old one.
! del linenos[prev_lineno]
! prev_lineno = ord(co_code[i+1]) + ord(co_code[i+2])*256
! linenos[prev_lineno] = 1
! if op >= dis.HAVE_ARGUMENT:
! i = i + 3
! else:
! i = i + 1
! prev_op = op
return linenos
--- 215,233 ----
prev_lineno = 0
while i < n:
! c = co_code[i]
! op = ord(c)
! if op == dis.SET_LINENO:
! if prev_op == op:
! # two SET_LINENO in a row, so the previous didn't
! # indicate anything. This occurs with triple
! # quoted strings (?). Remove the old one.
! del linenos[prev_lineno]
! prev_lineno = ord(co_code[i+1]) + ord(co_code[i+2])*256
! linenos[prev_lineno] = 1
! if op >= dis.HAVE_ARGUMENT:
! i = i + 3
! else:
! i = i + 1
! prev_op = op
return linenos
***************
*** 242,248 ****
# and check the constants for references to other code objects
for c in code.co_consts:
! if type(c) == types.CodeType:
! # find another code object, so recurse into it
! linenos.update(_find_LINENO(c))
return linenos
--- 241,247 ----
# and check the constants for references to other code objects
for c in code.co_consts:
! if type(c) == types.CodeType:
! # find another code object, so recurse into it
! linenos.update(_find_LINENO(c))
return linenos
***************
*** 290,294 ****
for filename, lineno in results.counts.keys():
lines_hit = per_file[filename] = per_file.get(filename, {})
! lines_hit[lineno] = results.counts[(filename, lineno)]
# try and merge existing counts and modules file from dirname
--- 289,293 ----
for filename, lineno in results.counts.keys():
lines_hit = per_file[filename] = per_file.get(filename, {})
! lines_hit[lineno] = results.counts[(filename, lineno)]
# try and merge existing counts and modules file from dirname
***************
*** 324,344 ****
coverpath = os.path.join(dirname, fndir)
! if filename.endswith(".pyc") or filename.endswith(".pyo"):
filename = filename[:-1]
! # Get the original lines from the .py file
! try:
! lines = open(filename, 'r').readlines()
! except IOError, err:
! sys.stderr.write(
! "%s: Could not open %s for reading because: %s - skipping\n" % \
! ("trace", `filename`, err.strerror))
! continue
!
! modulename = os.path.split(results.modules[key])[1]
!
! # build list file name by appending a ".cover" to the module name
! # and sticking it into the specified directory
! listfilename = os.path.join(coverpath, modulename + ".cover")
#sys.stderr.write("modulename: %(modulename)s\n"
# "filename: %(filename)s\n"
--- 323,343 ----
coverpath = os.path.join(dirname, fndir)
! if filename.endswith(".pyc") or filename.endswith(".pyo"):
filename = filename[:-1]
+
+ # Get the original lines from the .py file
+ try:
+ lines = open(filename, 'r').readlines()
+ except IOError, err:
+ sys.stderr.write("%s: Could not open %s for reading " \
+ "because: %s - skipping\n" % \
+ ("trace", `filename`, err.strerror))
+ continue
+
+ modulename = os.path.split(results.modules[key])[1]
! # build list file name by appending a ".cover" to the module name
! # and sticking it into the specified directory
! listfilename = os.path.join(coverpath, modulename + ".cover")
#sys.stderr.write("modulename: %(modulename)s\n"
# "filename: %(filename)s\n"
***************
*** 347,391 ****
# "dirname: %(dirname)s\n"
# % locals())
! try:
! outfile = open(listfilename, 'w')
! except IOError, err:
! sys.stderr.write(
! '%s: Could not open %s for writing because: %s - skipping\n' %
! ("trace", `listfilename`, err.strerror))
! continue
!
! # If desired, get a list of the line numbers which represent
! # executable content (returned as a dict for better lookup speed)
! if show_missing:
! executable_linenos = find_executable_linenos(filename)
! else:
! executable_linenos = {}
!
! lines_hit = per_file[key]
! for i in range(len(lines)):
! line = lines[i]
!
! # do the blank/comment match to try to mark more lines
! # (help the reader find stuff that hasn't been covered)
! if lines_hit.has_key(i+1):
! # count precedes the lines that we captured
! outfile.write('%5d: ' % lines_hit[i+1])
! elif blank.match(line):
! # blank lines and comments are preceded by dots
! outfile.write(' . ')
! else:
! # lines preceded by no marks weren't hit
! # Highlight them if so indicated, unless the line contains
! # '#pragma: NO COVER' (it is possible to embed this into
! # the text as a non-comment; no easy fix)
! if executable_linenos.has_key(i+1) and \
! string.find(lines[i],
string.join(['#pragma', 'NO COVER'])) == -1:
! outfile.write('>>>>>> ')
! else:
! outfile.write(' '*7)
! outfile.write(string.expandtabs(lines[i], 8))
! outfile.close()
if save_counts:
--- 346,390 ----
# "dirname: %(dirname)s\n"
# % locals())
! try:
! outfile = open(listfilename, 'w')
! except IOError, err:
! sys.stderr.write(
! '%s: Could not open %s for writing because: %s" \
! "- skipping\n' % ("trace", `listfilename`, err.strerror))
! continue
!
! # If desired, get a list of the line numbers which represent
! # executable content (returned as a dict for better lookup speed)
! if show_missing:
! executable_linenos = find_executable_linenos(filename)
! else:
! executable_linenos = {}
!
! lines_hit = per_file[key]
! for i in range(len(lines)):
! line = lines[i]
!
! # do the blank/comment match to try to mark more lines
! # (help the reader find stuff that hasn't been covered)
! if lines_hit.has_key(i+1):
! # count precedes the lines that we captured
! outfile.write('%5d: ' % lines_hit[i+1])
! elif blank.match(line):
! # blank lines and comments are preceded by dots
! outfile.write(' . ')
! else:
! # lines preceded by no marks weren't hit
! # Highlight them if so indicated, unless the line contains
! # '#pragma: NO COVER' (it is possible to embed this into
! # the text as a non-comment; no easy fix)
! if executable_linenos.has_key(i+1) and \
! string.find(lines[i],
string.join(['#pragma', 'NO COVER'])) == -1:
! outfile.write('>>>>>> ')
! else:
! outfile.write(' '*7)
! outfile.write(string.expandtabs(lines[i], 8))
! outfile.close()
if save_counts:
***************
*** 397,402 ****
open(os.path.join(dirname, "modules"), "w"))
except IOError, err:
! sys.stderr.write("cannot save counts/modules files because %s" %
! err.strerror)
# There is a lot of code shared between these two classes even though
--- 396,401 ----
open(os.path.join(dirname, "modules"), "w"))
except IOError, err:
! sys.stderr.write("cannot save counts/modules " \
! "files because %s" % err.strerror)
# There is a lot of code shared between these two classes even though
***************
*** 409,494 ****
class Coverage:
def __init__(self, ignore = Ignore()):
! self.ignore = ignore
! self.ignore_names = ignore._ignore # access ignore's cache (speed hack)
! self.counts = {} # keys are (filename, linenumber)
! self.modules = {} # maps filename -> module name
def trace(self, frame, why, arg):
! if why == 'line':
! # something is fishy about getting the file name
! filename = frame.f_globals.get("__file__", None)
! if filename is None:
! filename = frame.f_code.co_filename
! modulename = frame.f_globals["__name__"]
!
! # We do this next block to keep from having to make methods
! # calls, which also requires resetting the trace
! ignore_it = self.ignore_names.get(modulename, -1)
! if ignore_it == -1: # unknown filename
! sys.settrace(None)
! ignore_it = self.ignore.names(filename, modulename)
! sys.settrace(self.trace)
!
! # record the module name for every file
! self.modules[filename] = modulename
!
! if not ignore_it:
! lineno = frame.f_lineno
!
! # record the file name and line number of every trace
! key = (filename, lineno)
! self.counts[key] = self.counts.get(key, 0) + 1
! return self.trace
def results(self):
! return CoverageResults(self.counts, self.modules)
class Trace:
def __init__(self, ignore = Ignore()):
! self.ignore = ignore
! self.ignore_names = ignore._ignore # access ignore's cache (speed hack)
! self.files = {'<string>': None} # stores lines from the .py file, or None
def trace(self, frame, why, arg):
! if why == 'line':
! filename = frame.f_code.co_filename
! modulename = frame.f_globals["__name__"]
!
! # We do this next block to keep from having to make methods
! # calls, which also requires resetting the trace
! ignore_it = self.ignore_names.get(modulename, -1)
! if ignore_it == -1: # unknown filename
! sys.settrace(None)
! ignore_it = self.ignore.names(filename, modulename)
! sys.settrace(self.trace)
!
! if not ignore_it:
! lineno = frame.f_lineno
! files = self.files
! if filename != '<string>' and not files.has_key(filename):
files[filename] = map(string.rstrip,
open(filename).readlines())
! # If you want to see filenames (the original behaviour), try:
! # modulename = filename
! # or, prettier but confusing when several files have the same name
! # modulename = os.path.basename(filename)
!
! if files[filename] != None:
! print '%s(%d): %s' % (os.path.basename(filename), lineno,
! files[filename][lineno-1])
! else:
! print '%s(%d): ??' % (modulename, lineno)
! return self.trace
def _err_exit(msg):
! sys.stderr.write("%s: %s\n" % (sys.argv[0], msg))
! sys.exit(1)
def main(argv = None):
--- 408,493 ----
class Coverage:
def __init__(self, ignore = Ignore()):
! self.ignore = ignore
! self.ignore_names = ignore._ignore # access ignore's cache (speed hack)
! self.counts = {} # keys are (filename, linenumber)
! self.modules = {} # maps filename -> module name
def trace(self, frame, why, arg):
! if why == 'line':
! # something is fishy about getting the file name
! filename = frame.f_globals.get("__file__", None)
! if filename is None:
! filename = frame.f_code.co_filename
! modulename = frame.f_globals["__name__"]
!
! # We do this next block to keep from having to make methods
! # calls, which also requires resetting the trace
! ignore_it = self.ignore_names.get(modulename, -1)
! if ignore_it == -1: # unknown filename
! sys.settrace(None)
! ignore_it = self.ignore.names(filename, modulename)
! sys.settrace(self.trace)
!
! # record the module name for every file
! self.modules[filename] = modulename
!
! if not ignore_it:
! lineno = frame.f_lineno
!
! # record the file name and line number of every trace
! key = (filename, lineno)
! self.counts[key] = self.counts.get(key, 0) + 1
! return self.trace
def results(self):
! return CoverageResults(self.counts, self.modules)
class Trace:
def __init__(self, ignore = Ignore()):
! self.ignore = ignore
! self.ignore_names = ignore._ignore # access ignore's cache (speed hack)
! self.files = {'<string>': None} # stores lines from the .py file, or None
def trace(self, frame, why, arg):
! if why == 'line':
! filename = frame.f_code.co_filename
! modulename = frame.f_globals["__name__"]
!
! # We do this next block to keep from having to make methods
! # calls, which also requires resetting the trace
! ignore_it = self.ignore_names.get(modulename, -1)
! if ignore_it == -1: # unknown filename
! sys.settrace(None)
! ignore_it = self.ignore.names(filename, modulename)
! sys.settrace(self.trace)
!
! if not ignore_it:
! lineno = frame.f_lineno
! files = self.files
! if filename != '<string>' and not files.has_key(filename):
files[filename] = map(string.rstrip,
open(filename).readlines())
! # If you want to see filenames (the original behaviour), try:
! # modulename = filename
! # or, prettier but confusing when several files have the same name
! # modulename = os.path.basename(filename)
!
! if files[filename] != None:
! print '%s(%d): %s' % (os.path.basename(filename), lineno,
! files[filename][lineno-1])
! else:
! print '%s(%d): ??' % (modulename, lineno)
! return self.trace
def _err_exit(msg):
! sys.stderr.write("%s: %s\n" % (sys.argv[0], msg))
! sys.exit(1)
def main(argv = None):
***************
*** 496,511 ****
if argv is None:
! argv = sys.argv
try:
! opts, prog_argv = getopt.getopt(argv[1:], "tcrRf:d:m",
! ["help", "version", "trace", "count",
! "report", "no-report",
! "file=", "logdir=", "missing",
! "ignore-module=", "ignore-dir="])
except getopt.error, msg:
! sys.stderr.write("%s: %s\n" % (sys.argv[0], msg))
! sys.stderr.write("Try `%s --help' for more information\n" % sys.argv[0])
! sys.exit(1)
trace = 0
--- 495,510 ----
if argv is None:
! argv = sys.argv
try:
! opts, prog_argv = getopt.getopt(argv[1:], "tcrRf:d:m",
! ["help", "version", "trace", "count",
! "report", "no-report",
! "file=", "logdir=", "missing",
! "ignore-module=", "ignore-dir="])
except getopt.error, msg:
! sys.stderr.write("%s: %s\n" % (sys.argv[0], msg))
! sys.stderr.write("Try `%s --help' for more information\n" % sys.argv[0])
! sys.exit(1)
trace = 0
***************
*** 520,660 ****
for opt, val in opts:
! if opt == "--help":
! usage(sys.stdout)
! sys.exit(0)
!
! if opt == "--version":
! sys.stdout.write("trace 2.0\n")
! sys.exit(0)
!
! if opt == "-t" or opt == "--trace":
! trace = 1
! continue
!
! if opt == "-c" or opt == "--count":
! count = 1
! continue
!
! if opt == "-r" or opt == "--report":
! report = 1
! continue
!
! if opt == "-R" or opt == "--no-report":
! no_report = 1
! continue
!
! if opt == "-f" or opt == "--file":
! counts_file = val
! continue
!
! if opt == "-d" or opt == "--logdir":
! logdir = val
! continue
!
! if opt == "-m" or opt == "--missing":
! missing = 1
! continue
!
! if opt == "--ignore-module":
! ignore_modules.append(val)
! continue
!
! if opt == "--ignore-dir":
! for s in string.split(val, os.pathsep):
! s = os.path.expandvars(s)
! # should I also call expanduser? (after all, could use $HOME)
!
! s = string.replace(s, "$prefix",
! os.path.join(sys.prefix, "lib",
! "python" + sys.version[:3]))
! s = string.replace(s, "$exec_prefix",
! os.path.join(sys.exec_prefix, "lib",
! "python" + sys.version[:3]))
! s = os.path.normpath(s)
! ignore_dirs.append(s)
! continue
! assert 0, "Should never get here"
if len(prog_argv) == 0:
! _err_exit("missing name of file to run")
if count + trace + report > 1:
! _err_exit("can only specify one of --trace, --count or --report")
if count + trace + report == 0:
! _err_exit("must specify one of --trace, --count or --report")
if report and counts_file is None:
! _err_exit("--report requires a --file")
if report and no_report:
! _err_exit("cannot specify both --report and --no-report")
if logdir is not None:
! # warn if the directory doesn't exist, but keep on going
! # (is this the correct behaviour?)
! if not os.path.isdir(logdir):
! sys.stderr.write(
! "trace: WARNING, --logdir directory %s is not available\n" %
! `logdir`)
sys.argv = prog_argv
progname = prog_argv[0]
if eval(sys.version[:3])>1.3:
! sys.path[0] = os.path.split(progname)[0] # ???
# everything is ready
ignore = Ignore(ignore_modules, ignore_dirs)
if trace:
! t = Trace(ignore)
! try:
! run(t.trace, 'execfile(' + `progname` + ')')
! except IOError, err:
! _err_exit("Cannot run file %s because: %s" % \
! (`sys.argv[0]`, err.strerror))
elif count:
! t = Coverage(ignore)
! try:
! run(t.trace, 'execfile(' + `progname` + ')')
! except IOError, err:
! _err_exit("Cannot run file %s because: %s" % \
! (`sys.argv[0]`, err.strerror))
! except SystemExit:
! pass
!
! results = t.results()
! # Add another lookup from the program's file name to its import name
! # This give the right results, but I'm not sure why ...
! results.modules[progname] = os.path.splitext(progname)[0]
!
! if counts_file:
! # add in archived data, if available
! try:
! old_counts, old_modules = marshal.load(open(counts_file, 'rb'))
! except IOError:
! pass
! else:
! results.update(CoverageResults(old_counts, old_modules))
!
! if not no_report:
! create_results_log(results, logdir, missing)
!
! if counts_file:
! try:
! marshal.dump( (results.counts, results.modules),
! open(counts_file, 'wb'))
! except IOError, err:
! _err_exit("Cannot save counts file %s because: %s" % \
! (`counts_file`, err.strerror))
elif report:
! old_counts, old_modules = marshal.load(open(counts_file, 'rb'))
! results = CoverageResults(old_counts, old_modules)
! create_results_log(results, logdir, missing)
else:
! assert 0, "Should never get here"
if __name__=='__main__':
--- 519,659 ----
for opt, val in opts:
! if opt == "--help":
! usage(sys.stdout)
! sys.exit(0)
!
! if opt == "--version":
! sys.stdout.write("trace 2.0\n")
! sys.exit(0)
!
! if opt == "-t" or opt == "--trace":
! trace = 1
! continue
!
! if opt == "-c" or opt == "--count":
! count = 1
! continue
!
! if opt == "-r" or opt == "--report":
! report = 1
! continue
!
! if opt == "-R" or opt == "--no-report":
! no_report = 1
! continue
! if opt == "-f" or opt == "--file":
! counts_file = val
! continue
!
! if opt == "-d" or opt == "--logdir":
! logdir = val
! continue
!
! if opt == "-m" or opt == "--missing":
! missing = 1
! continue
!
! if opt == "--ignore-module":
! ignore_modules.append(val)
! continue
!
! if opt == "--ignore-dir":
! for s in string.split(val, os.pathsep):
! s = os.path.expandvars(s)
! # should I also call expanduser? (after all, could use $HOME)
!
! s = string.replace(s, "$prefix",
! os.path.join(sys.prefix, "lib",
! "python" + sys.version[:3]))
! s = string.replace(s, "$exec_prefix",
! os.path.join(sys.exec_prefix, "lib",
! "python" + sys.version[:3]))
! s = os.path.normpath(s)
! ignore_dirs.append(s)
! continue
!
! assert 0, "Should never get here"
if len(prog_argv) == 0:
! _err_exit("missing name of file to run")
if count + trace + report > 1:
! _err_exit("can only specify one of --trace, --count or --report")
if count + trace + report == 0:
! _err_exit("must specify one of --trace, --count or --report")
if report and counts_file is None:
! _err_exit("--report requires a --file")
if report and no_report:
! _err_exit("cannot specify both --report and --no-report")
if logdir is not None:
! # warn if the directory doesn't exist, but keep on going
! # (is this the correct behaviour?)
! if not os.path.isdir(logdir):
! sys.stderr.write(
! "trace: WARNING, --logdir directory %s is not available\n" %
! `logdir`)
sys.argv = prog_argv
progname = prog_argv[0]
if eval(sys.version[:3])>1.3:
! sys.path[0] = os.path.split(progname)[0] # ???
# everything is ready
ignore = Ignore(ignore_modules, ignore_dirs)
if trace:
! t = Trace(ignore)
! try:
! run(t.trace, 'execfile(' + `progname` + ')')
! except IOError, err:
! _err_exit("Cannot run file %s because: %s" % \
! (`sys.argv[0]`, err.strerror))
elif count:
! t = Coverage(ignore)
! try:
! run(t.trace, 'execfile(' + `progname` + ')')
! except IOError, err:
! _err_exit("Cannot run file %s because: %s" % \
! (`sys.argv[0]`, err.strerror))
! except SystemExit:
! pass
!
! results = t.results()
! # Add another lookup from the program's file name to its import name
! # This give the right results, but I'm not sure why ...
! results.modules[progname] = os.path.splitext(progname)[0]
!
! if counts_file:
! # add in archived data, if available
! try:
! old_counts, old_modules = marshal.load(open(counts_file, 'rb'))
! except IOError:
! pass
! else:
! results.update(CoverageResults(old_counts, old_modules))
!
! if not no_report:
! create_results_log(results, logdir, missing)
!
! if counts_file:
! try:
! marshal.dump( (results.counts, results.modules),
! open(counts_file, 'wb'))
! except IOError, err:
! _err_exit("Cannot save counts file %s because: %s" % \
! (`counts_file`, err.strerror))
elif report:
! old_counts, old_modules = marshal.load(open(counts_file, 'rb'))
! results = CoverageResults(old_counts, old_modules)
! create_results_log(results, logdir, missing)
else:
! assert 0, "Should never get here"
if __name__=='__main__':