Fix most trivially-findable print statements.
There's one major and one minor category still unfixed:
doctests are the major category (and I hope to be able to augment the
refactoring tool to refactor bona fide doctests soon);
other code generating print statements in strings is the minor category.
(Oh, and I don't know if the compiler package works.)
diff --git a/Lib/trace.py b/Lib/trace.py
index ca44eae..b2ec557 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -221,8 +221,8 @@
pickle.load(open(self.infile, 'rb'))
self.update(self.__class__(counts, calledfuncs, callers))
except (IOError, EOFError, ValueError) as err:
- print >> sys.stderr, ("Skipping counts file %r: %s"
- % (self.infile, err))
+ print(("Skipping counts file %r: %s"
+ % (self.infile, err)), file=sys.stderr)
def update(self, other):
"""Merge in the data from another CoverageResults"""
@@ -247,30 +247,30 @@
@param coverdir
"""
if self.calledfuncs:
- print
- print "functions called:"
+ print()
+ print("functions called:")
calls = self.calledfuncs.keys()
calls.sort()
for filename, modulename, funcname in calls:
- print ("filename: %s, modulename: %s, funcname: %s"
- % (filename, modulename, funcname))
+ print(("filename: %s, modulename: %s, funcname: %s"
+ % (filename, modulename, funcname)))
if self.callers:
- print
- print "calling relationships:"
+ print()
+ print("calling relationships:")
calls = self.callers.keys()
calls.sort()
lastfile = lastcfile = ""
for ((pfile, pmod, pfunc), (cfile, cmod, cfunc)) in calls:
if pfile != lastfile:
- print
- print "***", pfile, "***"
+ print()
+ print("***", pfile, "***")
lastfile = pfile
lastcfile = ""
if cfile != pfile and lastcfile != cfile:
- print " -->", cfile
+ print(" -->", cfile)
lastcfile = cfile
- print " %s.%s -> %s.%s" % (pmod, pfunc, cmod, cfunc)
+ print(" %s.%s -> %s.%s" % (pmod, pfunc, cmod, cfunc))
# turn the counts data ("(filename, lineno) = count") into something
# accessible on a per-file basis
@@ -318,10 +318,10 @@
if summary and sums:
mods = sums.keys()
mods.sort()
- print "lines cov% module (path)"
+ print("lines cov% module (path)")
for m in mods:
n_lines, percent, modulename, filename = sums[m]
- print "%5d %3d%% %s (%s)" % sums[m]
+ print("%5d %3d%% %s (%s)" % sums[m])
if self.outfile:
# try and store counts and module info into self.outfile
@@ -329,7 +329,7 @@
pickle.dump((self.counts, self.calledfuncs, self.callers),
open(self.outfile, 'wb'), 1)
except IOError as err:
- print >> sys.stderr, "Can't save counts files because %s" % err
+ print("Can't save counts files because %s" % err, file=sys.stderr)
def write_results_file(self, path, lines, lnotab, lines_hit):
"""Return a coverage results file in path."""
@@ -337,8 +337,8 @@
try:
outfile = open(path, "w")
except IOError as err:
- print >> sys.stderr, ("trace: Could not open %r for writing: %s"
- "- skipping" % (path, err))
+ print(("trace: Could not open %r for writing: %s"
+ "- skipping" % (path, err)), file=sys.stderr)
return 0, 0
n_lines = 0
@@ -423,8 +423,8 @@
try:
prog = open(filename, "rU").read()
except IOError as err:
- print >> sys.stderr, ("Not printing coverage data for %r: %s"
- % (filename, err))
+ print(("Not printing coverage data for %r: %s"
+ % (filename, err)), file=sys.stderr)
return {}
code = compile(prog, filename, "exec")
strs = find_strings(filename)
@@ -596,8 +596,8 @@
ignore_it = self.ignore.names(filename, modulename)
if not ignore_it:
if self.trace:
- print (" --- modulename: %s, funcname: %s"
- % (modulename, code.co_name))
+ print((" --- modulename: %s, funcname: %s"
+ % (modulename, code.co_name)))
return self.localtrace
else:
return None
@@ -611,8 +611,8 @@
self.counts[key] = self.counts.get(key, 0) + 1
bname = os.path.basename(filename)
- print "%s(%d): %s" % (bname, lineno,
- linecache.getline(filename, lineno)),
+ print("%s(%d): %s" % (bname, lineno,
+ linecache.getline(filename, lineno)), end=' ')
return self.localtrace
def localtrace_trace(self, frame, why, arg):
@@ -622,8 +622,8 @@
lineno = frame.f_lineno
bname = os.path.basename(filename)
- print "%s(%d): %s" % (bname, lineno,
- linecache.getline(filename, lineno)),
+ print("%s(%d): %s" % (bname, lineno,
+ linecache.getline(filename, lineno)), end=' ')
return self.localtrace
def localtrace_count(self, frame, why, arg):