languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-04 15:56:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix most trivially-findable print statements.

Browse source 
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.)
This commit is contained in:
Guido van Rossum 2007-02-09 05:37:30 +00:00
parent 452bf519a7
commit be19ed77dd
331 changed files with 2567 additions and 2648 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Lib/BaseHTTPServer.py
View file

@ -570,7 +570,7 @@ def test(HandlerClass = BaseHTTPRequestHandler,
httpd = ServerClass(server_address, HandlerClass)
sa = httpd.socket.getsockname()
print "Serving HTTP on", sa[0], "port", sa[1], "..."
print("Serving HTTP on", sa[0], "port", sa[1], "...")
httpd.serve_forever()

2
Lib/Bastion.py
View file

@ -165,7 +165,7 @@ def total(self):
print "accessible"
\n"""
exec(testcode)
print '='*20, "Using rexec:", '='*20
print('='*20, "Using rexec:", '='*20)
import rexec
r = rexec.RExec()
m = r.add_module('__main__')

10
Lib/Cookie.py
View file

@ -80,9 +80,9 @@
>>> C = Cookie.SmartCookie()
>>> C["rocky"] = "road"
>>> C["rocky"]["path"] = "/cookie"
>>> print C.output(header="Cookie:")
>>> print(C.output(header="Cookie:"))
Cookie: rocky=road; Path=/cookie
>>> print C.output(attrs=[], header="Cookie:")
>>> print(C.output(attrs=[], header="Cookie:"))
Cookie: rocky=road
The load() method of a Cookie extracts cookies from a string. In a
@ -100,7 +100,7 @@
>>> C = Cookie.SmartCookie()
>>> C.load('keebler="E=everybody; L=\\"Loves\\"; fudge=\\012;";')
>>> print C
>>> print(C)
Set-Cookie: keebler="E=everybody; L=\"Loves\"; fudge=\012;"
Each element of the Cookie also supports all of the RFC 2109
@ -110,7 +110,7 @@
>>> C = Cookie.SmartCookie()
>>> C["oreo"] = "doublestuff"
>>> C["oreo"]["path"] = "/"
>>> print C
>>> print(C)
Set-Cookie: oreo=doublestuff; Path=/
Each dictionary element has a 'value' attribute, which gives you
@ -198,7 +198,7 @@
fact, this simply returns a SmartCookie.
>>> C = Cookie.Cookie()
>>> print C.__class__.__name__
>>> print(C.__class__.__name__)
SmartCookie

6
Lib/DocXMLRPCServer.py
View file

@ -270,9 +270,9 @@ def handle_get(self):
response = self.generate_html_documentation()
print 'Content-Type: text/html'
print 'Content-Length: %d' % len(response)
print
print('Content-Type: text/html')
print('Content-Length: %d' % len(response))
print()
sys.stdout.write(response)
def __init__(self):

16
Lib/SimpleXMLRPCServer.py
View file

@ -543,9 +543,9 @@ def handle_xmlrpc(self, request_text):
response = self._marshaled_dispatch(request_text)
print 'Content-Type: text/xml'
print 'Content-Length: %d' % len(response)
print
print('Content-Type: text/xml')
print('Content-Length: %d' % len(response))
print()
sys.stdout.write(response)
def handle_get(self):
@ -565,10 +565,10 @@ def handle_get(self):
'message' : message,
'explain' : explain
}
print 'Status: %d %s' % (code, message)
print 'Content-Type: text/html'
print 'Content-Length: %d' % len(response)
print
print('Status: %d %s' % (code, message))
print('Content-Type: text/html')
print('Content-Length: %d' % len(response))
print()
sys.stdout.write(response)
def handle_request(self, request_text = None):
@ -590,7 +590,7 @@ def handle_request(self, request_text = None):
self.handle_xmlrpc(request_text)
if __name__ == '__main__':
print 'Running XML-RPC server on port 8000'
print('Running XML-RPC server on port 8000')
server = SimpleXMLRPCServer(("localhost", 8000))
server.register_function(pow)
server.register_function(lambda x,y: x+y, 'add')

8
Lib/SocketServer.py
View file

@ -263,12 +263,12 @@ def handle_error(self, request, client_address):
The default is to print a traceback and continue.
"""
print '-'*40
print 'Exception happened during processing of request from',
print client_address
print('-'*40)
print('Exception happened during processing of request from', end=' ')
print(client_address)
import traceback
traceback.print_exc() # XXX But this goes to stderr!
print '-'*40
print('-'*40)
class TCPServer(BaseServer):

14
Lib/StringIO.py
View file

@ -291,14 +291,14 @@ def test():
if f.getvalue() != text:
raise RuntimeError, 'write failed'
length = f.tell()
print 'File length =', length
print('File length =', length)
f.seek(len(lines[0]))
f.write(lines[1])
f.seek(0)
print 'First line =', repr(f.readline())
print 'Position =', f.tell()
print('First line =', repr(f.readline()))
print('Position =', f.tell())
line = f.readline()
print 'Second line =', repr(line)
print('Second line =', repr(line))
f.seek(-len(line), 1)
line2 = f.read(len(line))
if line != line2:
@ -310,13 +310,13 @@ def test():
line2 = f.read()
if line != line2:
raise RuntimeError, 'bad result after seek back from EOF'
print 'Read', len(list), 'more lines'
print 'File length =', f.tell()
print('Read', len(list), 'more lines')
print('File length =', f.tell())
if f.tell() != length:
raise RuntimeError, 'bad length'
f.truncate(length/2)
f.seek(0, 2)
print 'Truncated length =', f.tell()
print('Truncated length =', f.tell())
if f.tell() != length/2:
raise RuntimeError, 'truncate did not adjust length'
f.close()

30
Lib/aifc.py
View file

@ -453,7 +453,7 @@ def _read_comm_chunk(self, chunk):
kludge = 0
if chunk.chunksize == 18:
kludge = 1
print 'Warning: bad COMM chunk size'
print('Warning: bad COMM chunk size')
chunk.chunksize = 23
#DEBUG end
self._comptype = chunk.read(4)
@ -518,11 +518,11 @@ def _readmark(self, chunk):
# a position 0 and name ''
self._markers.append((id, pos, name))
except EOFError:
print 'Warning: MARK chunk contains only',
print len(self._markers),
if len(self._markers) == 1: print 'marker',
else: print 'markers',
print 'instead of', nmarkers
print('Warning: MARK chunk contains only', end=' ')
print(len(self._markers), end=' ')
if len(self._markers) == 1: print('marker', end=' ')
else: print('markers', end=' ')
print('instead of', nmarkers)
class Aifc_write:
# Variables used in this class:
@ -939,16 +939,16 @@ def open(f, mode=None):
sys.argv.append('/usr/demos/data/audio/bach.aiff')
fn = sys.argv[1]
f = open(fn, 'r')
print "Reading", fn
print "nchannels =", f.getnchannels()
print "nframes =", f.getnframes()
print "sampwidth =", f.getsampwidth()
print "framerate =", f.getframerate()
print "comptype =", f.getcomptype()
print "compname =", f.getcompname()
print("Reading", fn)
print("nchannels =", f.getnchannels())
print("nframes =", f.getnframes())
print("sampwidth =", f.getsampwidth())
print("framerate =", f.getframerate())
print("comptype =", f.getcomptype())
print("compname =", f.getcompname())
if sys.argv[2:]:
gn = sys.argv[2]
print "Writing", gn
print("Writing", gn)
g = open(gn, 'w')
g.setparams(f.getparams())
while 1:
@ -958,4 +958,4 @@ def open(f, mode=None):
g.writeframes(data)
g.close()
f.close()
print "Done."
print("Done.")

2
Lib/asyncore.py
View file

@ -373,7 +373,7 @@ def log(self, message):
def log_info(self, message, type='info'):
if __debug__ or type != 'info':
print '%s: %s' % (type, message)
print('%s: %s' % (type, message))
def handle_read_event(self):
if self.accepting:

8
Lib/atexit.py
View file

@ -26,7 +26,7 @@ def _run_exitfuncs():
exc_info = sys.exc_info()
except:
import traceback
print >> sys.stderr, "Error in atexit._run_exitfuncs:"
print("Error in atexit._run_exitfuncs:", file=sys.stderr)
traceback.print_exc()
exc_info = sys.exc_info()
@ -53,11 +53,11 @@ def register(func, *targs, **kargs):
if __name__ == "__main__":
def x1():
print "running x1"
print("running x1")
def x2(n):
print "running x2(%r)" % (n,)
print("running x2(%r)" % (n,))
def x3(n, kwd=None):
print "running x3(%r, kwd=%r)" % (n, kwd)
print("running x3(%r, kwd=%r)" % (n, kwd))
register(x1)
register(x2, 12)

4
Lib/audiodev.py
View file

@ -240,7 +240,7 @@ def test(fn = None):
fn = 'f:just samples:just.aif'
import aifc
af = aifc.open(fn, 'r')
print fn, af.getparams()
print(fn, af.getparams())
p = AudioDev()
p.setoutrate(af.getframerate())
p.setsampwidth(af.getsampwidth())
@ -249,7 +249,7 @@ def test(fn = None):
while 1:
data = af.readframes(BUFSIZ)
if not data: break
print len(data)
print(len(data))
p.writeframes(data)
p.wait()

8
Lib/base64.py
View file

@ -330,11 +330,11 @@ def test():
opts, args = getopt.getopt(sys.argv[1:], 'deut')
except getopt.error as msg:
sys.stdout = sys.stderr
print msg
print """usage: %s [-d|-e|-u|-t] [file|-]
print(msg)
print("""usage: %s [-d|-e|-u|-t] [file|-]
-d, -u: decode
-e: encode (default)
-t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0]
-t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0])
sys.exit(2)
func = encode
for o, a in opts:
@ -352,7 +352,7 @@ def test1():
s0 = "Aladdin:open sesame"
s1 = encodestring(s0)
s2 = decodestring(s1)
print s0, repr(s1), s2
print(s0, repr(s1), s2)
if __name__ == '__main__':

28
Lib/bdb.py
View file

@ -58,7 +58,7 @@ def trace_dispatch(self, frame, event, arg):
return self.trace_dispatch
if event == 'c_return':
return self.trace_dispatch
print 'bdb.Bdb.dispatch: unknown debugging event:', repr(event)
print('bdb.Bdb.dispatch: unknown debugging event:', repr(event))
return self.trace_dispatch
def dispatch_line(self, frame):
@ -483,17 +483,17 @@ def bpprint(self, out=None):
disp = disp + 'yes '
else:
disp = disp + 'no '
print >>out, '%-4dbreakpoint %s at %s:%d' % (self.number, disp,
self.file, self.line)
print('%-4dbreakpoint %s at %s:%d' % (self.number, disp,
self.file, self.line), file=out)
if self.cond:
print >>out, '\tstop only if %s' % (self.cond,)
print('\tstop only if %s' % (self.cond,), file=out)
if self.ignore:
print >>out, '\tignore next %d hits' % (self.ignore)
print('\tignore next %d hits' % (self.ignore), file=out)
if (self.hits):
if (self.hits > 1): ss = 's'
else: ss = ''
print >>out, ('\tbreakpoint already hit %d time%s' %
(self.hits, ss))
print(('\tbreakpoint already hit %d time%s' %
(self.hits, ss)), file=out)
# -----------end of Breakpoint class----------
@ -582,27 +582,27 @@ class Tdb(Bdb):
def user_call(self, frame, args):
name = frame.f_code.co_name
if not name: name = '???'
print '+++ call', name, args
print('+++ call', name, args)
def user_line(self, frame):
import linecache
name = frame.f_code.co_name
if not name: name = '???'
fn = self.canonic(frame.f_code.co_filename)
line = linecache.getline(fn, frame.f_lineno)
print '+++', fn, frame.f_lineno, name, ':', line.strip()
print('+++', fn, frame.f_lineno, name, ':', line.strip())
def user_return(self, frame, retval):
print '+++ return', retval
print('+++ return', retval)
def user_exception(self, frame, exc_stuff):
print '+++ exception', exc_stuff
print('+++ exception', exc_stuff)
self.set_continue()
def foo(n):
print 'foo(', n, ')'
print('foo(', n, ')')
x = bar(n*10)
print 'bar returned', x
print('bar returned', x)
def bar(a):
print 'bar(', a, ')'
print('bar(', a, ')')
return a/2
def test():

4
Lib/bsddb/dbtables.py
View file

@ -208,12 +208,12 @@ def sync(self):
def _db_print(self) :
"""Print the database to stdout for debugging"""
print "******** Printing raw database for debugging ********"
print("******** Printing raw database for debugging ********")
cur = self.db.cursor()
try:
key, data = cur.first()
while 1:
print repr({key: data})
print(repr({key: data}))
next = cur.next()
if next:
key, data = next

18
Lib/bsddb/test/test_all.py
View file

@ -22,15 +22,15 @@
def print_versions():
print
print '-=' * 38
print db.DB_VERSION_STRING
print 'bsddb.db.version(): %s' % (db.version(), )
print 'bsddb.db.__version__: %s' % db.__version__
print 'bsddb.db.cvsid: %s' % db.cvsid
print 'python version: %s' % sys.version
print 'My pid: %s' % os.getpid()
print '-=' * 38
print()
print('-=' * 38)
print(db.DB_VERSION_STRING)
print('bsddb.db.version(): %s' % (db.version(), ))
print('bsddb.db.__version__: %s' % db.__version__)
print('bsddb.db.cvsid: %s' % db.cvsid)
print('python version: %s' % sys.version)
print('My pid: %s' % os.getpid())
print('-=' * 38)
class PrintInfoFakeTest(unittest.TestCase):

36
Lib/bsddb/test/test_associate.py
View file

@ -114,9 +114,9 @@ def tearDown(self):
def test00_associateDBError(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test00_associateDBError..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test00_associateDBError..." % \
self.__class__.__name__)
dupDB = db.DB(self.env)
dupDB.set_flags(db.DB_DUP)
@ -207,9 +207,9 @@ def getDB(self):
def test01_associateWithDB(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test01_associateWithDB..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test01_associateWithDB..." % \
self.__class__.__name__)
self.createDB()
@ -227,9 +227,9 @@ def test01_associateWithDB(self):
def test02_associateAfterDB(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test02_associateAfterDB..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test02_associateAfterDB..." % \
self.__class__.__name__)
self.createDB()
self.addDataToDB(self.getDB())
@ -257,7 +257,7 @@ def finish_test(self, secDB, txn=None):
vals[1].index('unknown')
if verbose:
print "Primary key traversal:"
print("Primary key traversal:")
self.cur = self.getDB().cursor(txn)
count = 0
rec = self.cur.first()
@ -268,13 +268,13 @@ def finish_test(self, secDB, txn=None):
assert rec[0] and type(rec[0]) == type(0)
count = count + 1
if verbose:
print rec
print(rec)
rec = self.cur.next()
assert count == len(musicdata) # all items accounted for
if verbose:
print "Secondary key traversal:"
print("Secondary key traversal:")
self.cur = secDB.cursor(txn)
count = 0
@ -294,7 +294,7 @@ def finish_test(self, secDB, txn=None):
while rec is not None:
count = count + 1
if verbose:
print rec
print(rec)
rec = self.cur.next()
# all items accounted for EXCEPT for 1 with "Blues" genre
assert count == len(musicdata)-1
@ -304,7 +304,7 @@ def finish_test(self, secDB, txn=None):
def getGenre(self, priKey, priData):
assert type(priData) == type("")
if verbose:
print 'getGenre key: %r data: %r' % (priKey, priData)
print('getGenre key: %r data: %r' % (priKey, priData))
genre = string.split(priData, '|')[2]
if genre == 'Blues':
return db.DB_DONOTINDEX
@ -343,9 +343,9 @@ def txn_finish_test(self, sDB, txn):
def test13_associate_in_transaction(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test13_associateAutoCommit..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test13_associateAutoCommit..." % \
self.__class__.__name__)
txn = self.env.txn_begin()
try:
@ -389,7 +389,7 @@ def addDataToDB(self, d):
def getGenre(self, priKey, priData):
assert type(priData) == type(())
if verbose:
print 'getGenre key: %r data: %r' % (priKey, priData)
print('getGenre key: %r data: %r' % (priKey, priData))
genre = priData[2]
if genre == 'Blues':
return db.DB_DONOTINDEX

148
Lib/bsddb/test/test_basics.py
View file

@ -31,10 +31,10 @@ class VersionTestCase(unittest.TestCase):
def test00_version(self):
info = db.version()
if verbose:
print '\n', '-=' * 20
print 'bsddb.db.version(): %s' % (info, )
print db.DB_VERSION_STRING
print '-=' * 20
print('\n', '-=' * 20)
print('bsddb.db.version(): %s' % (info, ))
print(db.DB_VERSION_STRING)
print('-=' * 20)
assert info == (db.DB_VERSION_MAJOR, db.DB_VERSION_MINOR,
db.DB_VERSION_PATCH)
@ -131,7 +131,7 @@ def populateDB(self, _txn=None):
num = len(d)
if verbose:
print "created %d records" % num
print("created %d records" % num)
def makeData(self, key):
@ -145,13 +145,13 @@ def test01_GetsAndPuts(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test01_GetsAndPuts..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test01_GetsAndPuts..." % self.__class__.__name__)
for key in ['0001', '0100', '0400', '0700', '0999']:
data = d.get(key)
if verbose:
print data
print(data)
assert d.get('0321') == '0321-0321-0321-0321-0321'
@ -164,7 +164,7 @@ def test01_GetsAndPuts(self):
d.delete('abcd')
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
if verbose: print(val)
else:
self.fail("expected exception")
@ -183,7 +183,7 @@ def test01_GetsAndPuts(self):
d.put('abcd', 'this should fail', flags=db.DB_NOOVERWRITE)
except db.DBKeyExistError as val:
assert val[0] == db.DB_KEYEXIST
if verbose: print val
if verbose: print(val)
else:
self.fail("expected exception")
@ -212,7 +212,7 @@ def test01_GetsAndPuts(self):
rec = d.get_both('0555', '0555-0555-0555-0555-0555')
if verbose:
print rec
print(rec)
assert d.get_both('0555', 'bad data') == None
@ -227,7 +227,7 @@ def test01_GetsAndPuts(self):
s = d.stat()
assert type(s) == type({})
if verbose:
print 'd.stat() returned this dictionary:'
print('d.stat() returned this dictionary:')
pprint(s)
@ -237,15 +237,15 @@ def test02_DictionaryMethods(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test02_DictionaryMethods..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test02_DictionaryMethods..." % \
self.__class__.__name__)
for key in ['0002', '0101', '0401', '0701', '0998']:
data = d[key]
assert data == self.makeData(key)
if verbose:
print data
print(data)
assert len(d) == self._numKeys
keys = d.keys()
@ -263,7 +263,7 @@ def test02_DictionaryMethods(self):
assert len(keys) == self._numKeys+1
if verbose:
print "the first 10 keys are:"
print("the first 10 keys are:")
pprint(keys[:10])
assert d['new record'] == 'a replacement record'
@ -278,7 +278,7 @@ def test02_DictionaryMethods(self):
assert len(items[0]) == 2
if verbose:
print "the first 10 items are:"
print("the first 10 items are:")
pprint(items[:10])
values = d.values()
@ -286,7 +286,7 @@ def test02_DictionaryMethods(self):
assert type(values) == type([])
if verbose:
print "the first 10 values are:"
print("the first 10 values are:")
pprint(values[:10])
@ -295,9 +295,9 @@ def test02_DictionaryMethods(self):
def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
if verbose:
print '\n', '-=' * 30
print "Running %s.test03_SimpleCursorStuff (get_error %s, set_error %s)..." % \
(self.__class__.__name__, get_raises_error, set_raises_error)
print('\n', '-=' * 30)
print("Running %s.test03_SimpleCursorStuff (get_error %s, set_error %s)..." % \
(self.__class__.__name__, get_raises_error, set_raises_error))
if self.env and self.dbopenflags & db.DB_AUTO_COMMIT:
txn = self.env.txn_begin()
@ -310,13 +310,13 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
while rec is not None:
count = count + 1
if verbose and count % 100 == 0:
print rec
print(rec)
try:
rec = c.next()
except db.DBNotFoundError as val:
if get_raises_error:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
if verbose: print(val)
rec = None
else:
self.fail("unexpected DBNotFoundError")
@ -330,13 +330,13 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
while rec is not None:
count = count + 1
if verbose and count % 100 == 0:
print rec
print(rec)
try:
rec = c.prev()
except db.DBNotFoundError as val:
if get_raises_error:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
if verbose: print(val)
rec = None
else:
self.fail("unexpected DBNotFoundError")
@ -359,7 +359,7 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
n = c.set('bad key')
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
if verbose: print(val)
else:
if set_raises_error:
self.fail("expected exception")
@ -373,7 +373,7 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
n = c.get_both('0404', 'bad data')
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
if verbose: print(val)
else:
if get_raises_error:
self.fail("expected exception")
@ -383,16 +383,16 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
if self.d.get_type() == db.DB_BTREE:
rec = c.set_range('011')
if verbose:
print "searched for '011', found: ", rec
print("searched for '011', found: ", rec)
rec = c.set_range('011',dlen=0,doff=0)
if verbose:
print "searched (partial) for '011', found: ", rec
print("searched (partial) for '011', found: ", rec)
if rec[1] != '': self.fail('expected empty data portion')
ev = c.set_range('empty value')
if verbose:
print "search for 'empty value' returned", ev
print("search for 'empty value' returned", ev)
if ev[1] != '': self.fail('empty value lookup failed')
c.set('0499')
@ -402,7 +402,7 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
except db.DBKeyEmptyError as val:
if get_raises_error:
assert val[0] == db.DB_KEYEMPTY
if verbose: print val
if verbose: print(val)
else:
self.fail("unexpected DBKeyEmptyError")
else:
@ -441,13 +441,13 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
for method, args in methods_to_test.items():
try:
if verbose:
print "attempting to use a closed cursor's %s method" % \
method
print("attempting to use a closed cursor's %s method" % \
method)
# a bug may cause a NULL pointer dereference...
getattr(c, method)(*args)
except db.DBError as val:
assert val[0] == 0
if verbose: print val
if verbose: print(val)
else:
self.fail("no exception raised when using a buggy cursor's"
"%s method" % method)
@ -466,9 +466,9 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
def test03b_SimpleCursorWithoutGetReturnsNone0(self):
# same test but raise exceptions instead of returning None
if verbose:
print '\n', '-=' * 30
print "Running %s.test03b_SimpleCursorStuffWithoutGetReturnsNone..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test03b_SimpleCursorStuffWithoutGetReturnsNone..." % \
self.__class__.__name__)
old = self.d.set_get_returns_none(0)
assert old == 2
@ -477,9 +477,9 @@ def test03b_SimpleCursorWithoutGetReturnsNone0(self):
def test03b_SimpleCursorWithGetReturnsNone1(self):
# same test but raise exceptions instead of returning None
if verbose:
print '\n', '-=' * 30
print "Running %s.test03b_SimpleCursorStuffWithoutGetReturnsNone..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test03b_SimpleCursorStuffWithoutGetReturnsNone..." % \
self.__class__.__name__)
old = self.d.set_get_returns_none(1)
self.test03_SimpleCursorStuff(get_raises_error=0, set_raises_error=1)
@ -488,9 +488,9 @@ def test03b_SimpleCursorWithGetReturnsNone1(self):
def test03c_SimpleCursorGetReturnsNone2(self):
# same test but raise exceptions instead of returning None
if verbose:
print '\n', '-=' * 30
print "Running %s.test03c_SimpleCursorStuffWithoutSetReturnsNone..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test03c_SimpleCursorStuffWithoutSetReturnsNone..." % \
self.__class__.__name__)
old = self.d.set_get_returns_none(1)
assert old == 2
@ -503,9 +503,9 @@ def test03c_SimpleCursorGetReturnsNone2(self):
def test04_PartialGetAndPut(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test04_PartialGetAndPut..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test04_PartialGetAndPut..." % \
self.__class__.__name__)
key = "partialTest"
data = "1" * 1000 + "2" * 1000
@ -533,8 +533,8 @@ def test04_PartialGetAndPut(self):
def test05_GetSize(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test05_GetSize..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test05_GetSize..." % self.__class__.__name__)
for i in range(1, 50000, 500):
key = "size%s" % i
@ -553,8 +553,8 @@ def test06_Truncate(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test99_Truncate..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test99_Truncate..." % self.__class__.__name__)
d.put("abcde", "ABCDE");
num = d.truncate()
@ -598,8 +598,8 @@ def test07_EnvRemoveAndRename(self):
return
if verbose:
print '\n', '-=' * 30
print "Running %s.test07_EnvRemoveAndRename..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test07_EnvRemoveAndRename..." % self.__class__.__name__)
# can't rename or remove an open DB
self.d.close()
@ -647,8 +647,8 @@ def populateDB(self):
def test06_Transactions(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test06_Transactions..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test06_Transactions..." % self.__class__.__name__)
assert d.get('new rec', txn=self.txn) == None
d.put('new rec', 'this is a new record', self.txn)
@ -671,7 +671,7 @@ def test06_Transactions(self):
while rec is not None:
count = count + 1
if verbose and count % 100 == 0:
print rec
print(rec)
rec = c.next()
assert count == self._numKeys+1
@ -696,7 +696,7 @@ def test06_Transactions(self):
assert logs != None
for log in logs:
if verbose:
print 'log file: ' + log
print('log file: ' + log)
if db.version() >= (4,2):
logs = self.env.log_archive(db.DB_ARCH_REMOVE)
assert not logs
@ -712,8 +712,8 @@ def test07_TxnTruncate(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test07_TxnTruncate..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test07_TxnTruncate..." % self.__class__.__name__)
d.put("abcde", "ABCDE");
txn = self.env.txn_begin()
@ -762,21 +762,21 @@ class BTreeRecnoTestCase(BasicTestCase):
def test07_RecnoInBTree(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test07_RecnoInBTree..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test07_RecnoInBTree..." % self.__class__.__name__)
rec = d.get(200)
assert type(rec) == type(())
assert len(rec) == 2
if verbose:
print "Record #200 is ", rec
print("Record #200 is ", rec)
c = d.cursor()
c.set('0200')
num = c.get_recno()
assert type(num) == type(1)
if verbose:
print "recno of d['0200'] is ", num
print("recno of d['0200'] is ", num)
rec = c.current()
assert c.set_recno(num) == rec
@ -796,9 +796,9 @@ class BasicDUPTestCase(BasicTestCase):
def test08_DuplicateKeys(self):
d = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test08_DuplicateKeys..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test08_DuplicateKeys..." % \
self.__class__.__name__)
d.put("dup0", "before")
for x in "The quick brown fox jumped over the lazy dog.".split():
@ -808,7 +808,7 @@ def test08_DuplicateKeys(self):
data = d.get("dup1")
assert data == "The"
if verbose:
print data
print(data)
c = d.cursor()
rec = c.set("dup1")
@ -827,14 +827,14 @@ def test08_DuplicateKeys(self):
rec = c.set('dup1')
while rec is not None:
if verbose:
print rec
print(rec)
rec = c.next_dup()
c.set('dup1')
rec = c.next_nodup()
assert rec[0] != 'dup1'
if verbose:
print rec
print(rec)
c.close()
@ -869,8 +869,8 @@ def otherType(self):
def test09_MultiDB(self):
d1 = self.d
if verbose:
print '\n', '-=' * 30
print "Running %s.test09_MultiDB..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test09_MultiDB..." % self.__class__.__name__)
d2 = db.DB(self.env)
d2.open(self.filename, "second", self.dbtype,
@ -910,7 +910,7 @@ def test09_MultiDB(self):
while rec is not None:
count = count + 1
if verbose and (count % 50) == 0:
print rec
print(rec)
rec = c1.next()
assert count == self._numKeys
@ -919,7 +919,7 @@ def test09_MultiDB(self):
while rec is not None:
count = count + 1
if verbose:
print rec
print(rec)
rec = c2.next()
assert count == 9
@ -928,7 +928,7 @@ def test09_MultiDB(self):
while rec is not None:
count = count + 1
if verbose:
print rec
print(rec)
rec = c3.next()
assert count == 52

30
Lib/bsddb/test/test_compat.py
View file

@ -37,7 +37,7 @@ def test02_hashopen(self):
def test03_rnopen(self):
data = string.split("The quick brown fox jumped over the lazy dog.")
if verbose:
print "\nTesting: rnopen"
print("\nTesting: rnopen")
f = rnopen(self.filename, 'c')
for x in range(len(data)):
@ -45,7 +45,7 @@ def test03_rnopen(self):
getTest = (f[1], f[2], f[3])
if verbose:
print '%s %s %s' % getTest
print('%s %s %s' % getTest)
assert getTest[1] == 'quick', 'data mismatch!'
@ -73,7 +73,7 @@ def badKey(f):
rec = f.first()
while rec:
if verbose:
print rec
print(rec)
try:
rec = f.next()
except KeyError:
@ -89,17 +89,17 @@ def test04_n_flag(self):
def do_bthash_test(self, factory, what):
if verbose:
print '\nTesting: ', what
print('\nTesting: ', what)
f = factory(self.filename, 'c')
if verbose:
print 'creation...'
print('creation...')
# truth test
if f:
if verbose: print "truth test: true"
if verbose: print("truth test: true")
else:
if verbose: print "truth test: false"
if verbose: print("truth test: false")
f['0'] = ''
f['a'] = 'Guido'
@ -109,10 +109,10 @@ def do_bthash_test(self, factory, what):
# 'e' intentionally left out
f['f'] = 'Python'
if verbose:
print '%s %s %s' % (f['a'], f['b'], f['c'])
print('%s %s %s' % (f['a'], f['b'], f['c']))
if verbose:
print 'key ordering...'
print('key ordering...')
start = f.set_location(f.first()[0])
if start != ('0', ''):
self.fail("incorrect first() result: "+repr(start))
@ -124,7 +124,7 @@ def do_bthash_test(self, factory, what):
f.previous()
break
if verbose:
print rec
print(rec)
assert f.has_key('f'), 'Error, missing key!'
@ -147,9 +147,9 @@ def do_bthash_test(self, factory, what):
# truth test
try:
if f:
if verbose: print "truth test: true"
if verbose: print("truth test: true")
else:
if verbose: print "truth test: false"
if verbose: print("truth test: false")
except db.DBError:
pass
else:
@ -158,16 +158,16 @@ def do_bthash_test(self, factory, what):
del f
if verbose:
print 'modification...'
print('modification...')
f = factory(self.filename, 'w')
f['d'] = 'discovered'
if verbose:
print 'access...'
print('access...')
for key in f.keys():
word = f[key]
if verbose:
print word
print(word)
def noRec(f):
rec = f['no such key']

20
Lib/bsddb/test/test_dbshelve.py
View file

@ -79,8 +79,8 @@ def do_close(self):
def test01_basics(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test01_basics..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test01_basics..." % self.__class__.__name__)
self.populateDB(self.d)
self.d.sync()
@ -94,9 +94,9 @@ def test01_basics(self):
f = d.fd()
if verbose:
print "length:", l
print "keys:", k
print "stats:", s
print("length:", l)
print("keys:", k)
print("stats:", s)
assert 0 == d.has_key('bad key')
assert 1 == d.has_key('IA')
@ -113,7 +113,7 @@ def test01_basics(self):
value = d[key]
values.append(value)
if verbose:
print "%s: %s" % (key, value)
print("%s: %s" % (key, value))
self.checkrec(key, value)
dbvalues = sorted(d.values(), key=lambda x: (str(type(x)), x))
@ -144,8 +144,8 @@ def test01_basics(self):
def test02_cursors(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test02_cursors..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test02_cursors..." % self.__class__.__name__)
self.populateDB(self.d)
d = self.d
@ -156,7 +156,7 @@ def test02_cursors(self):
while rec is not None:
count = count + 1
if verbose:
print rec
print(rec)
key, value = rec
self.checkrec(key, value)
rec = c.next()
@ -170,7 +170,7 @@ def test02_cursors(self):
while rec is not None:
count = count + 1
if verbose:
print rec
print(rec)
key, value = rec
self.checkrec(key, value)
rec = c.prev()

8
Lib/bsddb/test/test_dbtables.py
View file

@ -110,7 +110,7 @@ def test02(self):
assert values[1]['Species'] == 'Penguin'
else :
if verbose:
print "values= %r" % (values,)
print("values= %r" % (values,))
raise "Wrong values returned!"
def test03(self):
@ -120,15 +120,15 @@ def test03(self):
except dbtables.TableDBError:
pass
if verbose:
print '...before CreateTable...'
print('...before CreateTable...')
self.tdb._db_print()
self.tdb.CreateTable(tabname, ['a', 'b', 'c', 'd', 'e'])
if verbose:
print '...after CreateTable...'
print('...after CreateTable...')
self.tdb._db_print()
self.tdb.Drop(tabname)
if verbose:
print '...after Drop...'
print('...after Drop...')
self.tdb._db_print()
self.tdb.CreateTable(tabname, ['a', 'b', 'c', 'd', 'e'])

6
Lib/bsddb/test/test_join.py
View file

@ -65,9 +65,9 @@ def tearDown(self):
def test01_join(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test01_join..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test01_join..." % \
self.__class__.__name__)
# create and populate primary index
priDB = db.DB(self.env)

20
Lib/bsddb/test/test_lock.py
View file

@ -49,27 +49,27 @@ def tearDown(self):
def test01_simple(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test01_simple..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test01_simple..." % self.__class__.__name__)
anID = self.env.lock_id()
if verbose:
print "locker ID: %s" % anID
print("locker ID: %s" % anID)
lock = self.env.lock_get(anID, "some locked thing", db.DB_LOCK_WRITE)
if verbose:
print "Aquired lock: %s" % lock
print("Aquired lock: %s" % lock)
time.sleep(1)
self.env.lock_put(lock)
if verbose:
print "Released lock: %s" % lock
print("Released lock: %s" % lock)
def test02_threaded(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test02_threaded..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test02_threaded..." % self.__class__.__name__)
threads = []
threads.append(Thread(target = self.theThread,
@ -113,17 +113,17 @@ def theThread(self, sleepTime, lockType):
anID = self.env.lock_id()
if verbose:
print "%s: locker ID: %s" % (name, anID)
print("%s: locker ID: %s" % (name, anID))
lock = self.env.lock_get(anID, "some locked thing", lockType)
if verbose:
print "%s: Aquired %s lock: %s" % (name, lt, lock)
print("%s: Aquired %s lock: %s" % (name, lt, lock))
time.sleep(sleepTime)
self.env.lock_put(lock)
if verbose:
print "%s: Released %s lock: %s" % (name, lt, lock)
print("%s: Released %s lock: %s" % (name, lt, lock))
#----------------------------------------------------------------------

34
Lib/bsddb/test/test_queue.py
View file

@ -34,15 +34,15 @@ def test01_basic(self):
# Basic Queue tests using the deprecated DBCursor.consume method.
if verbose:
print '\n', '-=' * 30
print "Running %s.test01_basic..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test01_basic..." % self.__class__.__name__)
d = db.DB()
d.set_re_len(40) # Queues must be fixed length
d.open(self.filename, db.DB_QUEUE, db.DB_CREATE)
if verbose:
print "before appends" + '-' * 30
print("before appends" + '-' * 30)
pprint(d.stat())
for x in string.letters:
@ -58,7 +58,7 @@ def test01_basic(self):
assert len(d) == 55
if verbose:
print "before close" + '-' * 30
print("before close" + '-' * 30)
pprint(d.stat())
d.close()
@ -67,25 +67,25 @@ def test01_basic(self):
d.open(self.filename)
if verbose:
print "after open" + '-' * 30
print("after open" + '-' * 30)
pprint(d.stat())
d.append("one more")
c = d.cursor()
if verbose:
print "after append" + '-' * 30
print("after append" + '-' * 30)
pprint(d.stat())
rec = c.consume()
while rec:
if verbose:
print rec
print(rec)
rec = c.consume()
c.close()
if verbose:
print "after consume loop" + '-' * 30
print("after consume loop" + '-' * 30)
pprint(d.stat())
assert len(d) == 0, \
@ -101,12 +101,12 @@ def test02_basicPost32(self):
# (No cursor needed)
if verbose:
print '\n', '-=' * 30
print "Running %s.test02_basicPost32..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test02_basicPost32..." % self.__class__.__name__)
if db.version() < (3, 2, 0):
if verbose:
print "Test not run, DB not new enough..."
print("Test not run, DB not new enough...")
return
d = db.DB()
@ -114,7 +114,7 @@ def test02_basicPost32(self):
d.open(self.filename, db.DB_QUEUE, db.DB_CREATE)
if verbose:
print "before appends" + '-' * 30
print("before appends" + '-' * 30)
pprint(d.stat())
for x in string.letters:
@ -130,7 +130,7 @@ def test02_basicPost32(self):
assert len(d) == 55
if verbose:
print "before close" + '-' * 30
print("before close" + '-' * 30)
pprint(d.stat())
d.close()
@ -140,23 +140,23 @@ def test02_basicPost32(self):
#d.set_get_returns_none(true)
if verbose:
print "after open" + '-' * 30
print("after open" + '-' * 30)
pprint(d.stat())
d.append("one more")
if verbose:
print "after append" + '-' * 30
print("after append" + '-' * 30)
pprint(d.stat())
rec = d.consume()
while rec:
if verbose:
print rec
print(rec)
rec = d.consume()
if verbose:
print "after consume loop" + '-' * 30
print("after consume loop" + '-' * 30)
pprint(d.stat())
d.close()

42
Lib/bsddb/test/test_recno.py
View file

@ -45,9 +45,9 @@ def test01_basic(self):
assert type(recno) == type(0)
assert recno >= 1
if verbose:
print recno,
print(recno, end=' ')
if verbose: print
if verbose: print()
stat = d.stat()
if verbose:
@ -56,7 +56,7 @@ def test01_basic(self):
for recno in range(1, len(d)+1):
data = d[recno]
if verbose:
print data
print(data)
assert type(data) == type("")
assert data == d.get(recno)
@ -65,7 +65,7 @@ def test01_basic(self):
data = d[0] # This should raise a KeyError!?!?!
except db.DBInvalidArgError as val:
assert val[0] == db.EINVAL
if verbose: print val
if verbose: print(val)
else:
self.fail("expected exception")
@ -94,7 +94,7 @@ def test01_basic(self):
keys = d.keys()
if verbose:
print keys
print(keys)
assert type(keys) == type([])
assert type(keys[0]) == type(123)
assert len(keys) == len(d)
@ -120,23 +120,23 @@ def test01_basic(self):
data = d.get_both(26, "z" * 60)
assert data == "z" * 60
if verbose:
print data
print(data)
fd = d.fd()
if verbose:
print fd
print(fd)
c = d.cursor()
rec = c.first()
while rec:
if verbose:
print rec
print(rec)
rec = c.next()
c.set(50)
rec = c.current()
if verbose:
print rec
print(rec)
c.put(-1, "a replacement record", db.DB_CURRENT)
@ -144,18 +144,18 @@ def test01_basic(self):
rec = c.current()
assert rec == (50, "a replacement record")
if verbose:
print rec
print(rec)
rec = c.set_range(30)
if verbose:
print rec
print(rec)
# test that non-existant key lookups work (and that
# DBC_set_range doesn't have a memleak under valgrind)
rec = c.set_range(999999)
assert rec == None
if verbose:
print rec
print(rec)
c.close()
d.close()
@ -182,7 +182,7 @@ def test01_basic(self):
self.fail("unexpected DBKeyEmptyError exception")
else:
assert val[0] == db.DB_KEYEMPTY
if verbose: print val
if verbose: print(val)
else:
if not get_returns_none:
self.fail("expected exception")
@ -190,7 +190,7 @@ def test01_basic(self):
rec = c.set(40)
while rec:
if verbose:
print rec
print(rec)
rec = c.next()
c.close()
@ -227,9 +227,9 @@ def test02_WithSource(self):
text = open(source, 'r').read()
text = text.strip()
if verbose:
print text
print data
print text.split('\n')
print(text)
print(data)
print(text.split('\n'))
assert text.split('\n') == data
@ -247,8 +247,8 @@ def test02_WithSource(self):
text = open(source, 'r').read()
text = text.strip()
if verbose:
print text
print text.split('\n')
print(text)
print(text.split('\n'))
assert text.split('\n') == \
"The quick reddish-brown fox jumped over the comatose dog".split()
@ -269,7 +269,7 @@ def test03_FixedLength(self):
d.append('bad' * 20)
except db.DBInvalidArgError as val:
assert val[0] == db.EINVAL
if verbose: print val
if verbose: print(val)
else:
self.fail("expected exception")
@ -277,7 +277,7 @@ def test03_FixedLength(self):
rec = c.first()
while rec:
if verbose:
print rec
print(rec)
rec = c.next()
c.close()

72
Lib/bsddb/test/test_thread.py
View file

@ -93,9 +93,9 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase):
def test01_1WriterMultiReaders(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test01_1WriterMultiReaders..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test01_1WriterMultiReaders..." % \
self.__class__.__name__)
threads = []
for x in range(self.writers):
@ -123,17 +123,17 @@ def writerThread(self, d, howMany, writerNum):
start = howMany * writerNum
stop = howMany * (writerNum + 1) - 1
if verbose:
print "%s: creating records %d - %d" % (name, start, stop)
print("%s: creating records %d - %d" % (name, start, stop))
for x in range(start, stop):
key = '%04d' % x
dbutils.DeadlockWrap(d.put, key, self.makeData(key),
max_retries=12)
if verbose and x % 100 == 0:
print "%s: records %d - %d finished" % (name, start, x)
print("%s: records %d - %d finished" % (name, start, x))
if verbose:
print "%s: finished creating records" % name
print("%s: finished creating records" % name)
## # Each write-cursor will be exclusive, the only one that can update the DB...
## if verbose: print "%s: deleting a few records" % name
@ -147,7 +147,7 @@ def writerThread(self, d, howMany, writerNum):
## c.close()
if verbose:
print "%s: thread finished" % name
print("%s: thread finished" % name)
def readerThread(self, d, readerNum):
time.sleep(0.01 * readerNum)
@ -163,12 +163,12 @@ def readerThread(self, d, readerNum):
self.assertEqual(self.makeData(key), data)
rec = c.next()
if verbose:
print "%s: found %d records" % (name, count)
print("%s: found %d records" % (name, count))
c.close()
time.sleep(0.05)
if verbose:
print "%s: thread finished" % name
print("%s: thread finished" % name)
class BTreeConcurrentDataStore(ConcurrentDataStoreBase):
@ -199,8 +199,8 @@ def setEnvOpts(self):
def test02_SimpleLocks(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test02_SimpleLocks..." % self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test02_SimpleLocks..." % self.__class__.__name__)
threads = []
for x in range(self.writers):
@ -226,7 +226,7 @@ def writerThread(self, d, howMany, writerNum):
start = howMany * writerNum
stop = howMany * (writerNum + 1) - 1
if verbose:
print "%s: creating records %d - %d" % (name, start, stop)
print("%s: creating records %d - %d" % (name, start, stop))
# create a bunch of records
for x in xrange(start, stop):
@ -235,7 +235,7 @@ def writerThread(self, d, howMany, writerNum):
max_retries=12)
if verbose and x % 100 == 0:
print "%s: records %d - %d finished" % (name, start, x)
print("%s: records %d - %d finished" % (name, start, x))
# do a bit or reading too
if random() <= 0.05:
@ -249,22 +249,22 @@ def writerThread(self, d, howMany, writerNum):
dbutils.DeadlockWrap(d.sync, max_retries=12)
except db.DBIncompleteError as val:
if verbose:
print "could not complete sync()..."
print("could not complete sync()...")
# read them back, deleting a few
for x in xrange(start, stop):
key = '%04d' % x
data = dbutils.DeadlockWrap(d.get, key, max_retries=12)
if verbose and x % 100 == 0:
print "%s: fetched record (%s, %s)" % (name, key, data)
print("%s: fetched record (%s, %s)" % (name, key, data))
self.assertEqual(data, self.makeData(key))
if random() <= 0.10:
dbutils.DeadlockWrap(d.delete, key, max_retries=12)
if verbose:
print "%s: deleted record %s" % (name, key)
print("%s: deleted record %s" % (name, key))
if verbose:
print "%s: thread finished" % name
print("%s: thread finished" % name)
def readerThread(self, d, readerNum):
time.sleep(0.01 * readerNum)
@ -280,12 +280,12 @@ def readerThread(self, d, readerNum):
self.assertEqual(self.makeData(key), data)
rec = dbutils.DeadlockWrap(c.next, max_retries=10)
if verbose:
print "%s: found %d records" % (name, count)
print("%s: found %d records" % (name, count))
c.close()
time.sleep(0.05)
if verbose:
print "%s: thread finished" % name
print("%s: thread finished" % name)
class BTreeSimpleThreaded(SimpleThreadedBase):
@ -318,9 +318,9 @@ def setEnvOpts(self):
def test03_ThreadedTransactions(self):
if verbose:
print '\n', '-=' * 30
print "Running %s.test03_ThreadedTransactions..." % \
self.__class__.__name__
print('\n', '-=' * 30)
print("Running %s.test03_ThreadedTransactions..." % \
self.__class__.__name__)
threads = []
for x in range(self.writers):
@ -357,12 +357,12 @@ def doWrite(self, d, name, start, stop):
key = '%04d' % x
d.put(key, self.makeData(key), txn)
if verbose and x % 100 == 0:
print "%s: records %d - %d finished" % (name, start, x)
print("%s: records %d - %d finished" % (name, start, x))
txn.commit()
finished = True
except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val:
if verbose:
print "%s: Aborting transaction (%s)" % (name, val[1])
print("%s: Aborting transaction (%s)" % (name, val[1]))
txn.abort()
time.sleep(0.05)
@ -371,16 +371,16 @@ def writerThread(self, d, howMany, writerNum):
start = howMany * writerNum
stop = howMany * (writerNum + 1) - 1
if verbose:
print "%s: creating records %d - %d" % (name, start, stop)
print("%s: creating records %d - %d" % (name, start, stop))
step = 100
for x in range(start, stop, step):
self.doWrite(d, name, x, min(stop, x+step))
if verbose:
print "%s: finished creating records" % name
print("%s: finished creating records" % name)
if verbose:
print "%s: deleting a few records" % name
print("%s: deleting a few records" % name)
finished = False
while not finished:
@ -397,15 +397,15 @@ def writerThread(self, d, howMany, writerNum):
txn.commit()
finished = True
if verbose:
print "%s: deleted records %s" % (name, recs)
print("%s: deleted records %s" % (name, recs))
except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val:
if verbose:
print "%s: Aborting transaction (%s)" % (name, val[1])
print("%s: Aborting transaction (%s)" % (name, val[1]))
txn.abort()
time.sleep(0.05)
if verbose:
print "%s: thread finished" % name
print("%s: thread finished" % name)
def readerThread(self, d, readerNum):
time.sleep(0.01 * readerNum + 0.05)
@ -424,13 +424,13 @@ def readerThread(self, d, readerNum):
key, data = rec
self.assertEqual(self.makeData(key), data)
rec = c.next()
if verbose: print "%s: found %d records" % (name, count)
if verbose: print("%s: found %d records" % (name, count))
c.close()
txn.commit()
finished = True
except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val:
if verbose:
print "%s: Aborting transaction (%s)" % (name, val[1])
print("%s: Aborting transaction (%s)" % (name, val[1]))
c.close()
txn.abort()
time.sleep(0.05)
@ -438,7 +438,7 @@ def readerThread(self, d, readerNum):
time.sleep(0.05)
if verbose:
print "%s: thread finished" % name
print("%s: thread finished" % name)
def deadlockThread(self):
self.doLockDetect = True
@ -448,8 +448,8 @@ def deadlockThread(self):
aborted = self.env.lock_detect(
db.DB_LOCK_RANDOM, db.DB_LOCK_CONFLICT)
if verbose and aborted:
print "deadlock: Aborted %d deadlocked transaction(s)" \
% aborted
print("deadlock: Aborted %d deadlocked transaction(s)" \
% aborted)
except db.DBError:
pass
@ -497,7 +497,7 @@ def test_suite():
suite.addTest(unittest.makeSuite(HashThreadedNoWaitTransactions))
else:
print "Threads not available, skipping thread tests."
print("Threads not available, skipping thread tests.")
return suite

4
Lib/cProfile.py
View file

@ -58,8 +58,8 @@ def runctx(statement, globals, locals, filename=None):
# Backwards compatibility.
def help():
print "Documentation for the profile/cProfile modules can be found "
print "in the Python Library Reference, section 'The Python Profiler'."
print("Documentation for the profile/cProfile modules can be found ")
print("in the Python Library Reference, section 'The Python Profiler'.")
# ____________________________________________________________

14
Lib/calendar.py
View file

@ -261,7 +261,7 @@ def prweek(self, theweek, width):
"""
Print a single week (no newline).
"""
print self.week(theweek, width),
print(self.week(theweek, width), end=' ')
def formatday(self, day, weekday, width):
"""
@ -308,7 +308,7 @@ def prmonth(self, theyear, themonth, w=0, l=0):
"""
Print a month's calendar.
"""
print self.formatmonth(theyear, themonth, w, l),
print(self.formatmonth(theyear, themonth, w, l), end=' ')
def formatmonth(self, theyear, themonth, w=0, l=0):
"""
@ -365,7 +365,7 @@ def formatyear(self, theyear, w=2, l=1, c=6, m=3):
def pryear(self, theyear, w=0, l=0, c=6, m=3):
"""Print a year's calendar."""
print self.formatyear(theyear, w, l, c, m)
print(self.formatyear(theyear, w, l, c, m))
class HTMLCalendar(Calendar):
@ -584,7 +584,7 @@ def setfirstweekday(firstweekday):
def format(cols, colwidth=_colwidth, spacing=_spacing):
"""Prints multi-column formatting for year calendars"""
print formatstring(cols, colwidth, spacing)
print(formatstring(cols, colwidth, spacing))
def formatstring(cols, colwidth=_colwidth, spacing=_spacing):
@ -668,9 +668,9 @@ def main(args):
encoding = sys.getdefaultencoding()
optdict = dict(encoding=encoding, css=options.css)
if len(args) == 1:
print cal.formatyearpage(datetime.date.today().year, **optdict)
print(cal.formatyearpage(datetime.date.today().year, **optdict))
elif len(args) == 2:
print cal.formatyearpage(int(args[1]), **optdict)
print(cal.formatyearpage(int(args[1]), **optdict))
else:
parser.error("incorrect number of arguments")
sys.exit(1)
@ -694,7 +694,7 @@ def main(args):
sys.exit(1)
if options.encoding:
result = result.encode(options.encoding)
print result
print(result)
if __name__ == "__main__":

70
Lib/cgi.py
View file

@ -901,8 +901,8 @@ def test(environ=os.environ):
the script in HTML form.
"""
print "Content-type: text/html"
print
print("Content-type: text/html")
print()
sys.stderr = sys.stdout
try:
form = FieldStorage() # Replace with other classes to test those
@ -915,12 +915,12 @@ def f():
exec("testing print_exception() -- <I>italics?</I>")
def g(f=f):
f()
print "<H3>What follows is a test, not an actual exception:</H3>"
print("<H3>What follows is a test, not an actual exception:</H3>")
g()
except:
print_exception()
print "<H1>Second try with a small maxlen...</H1>"
print("<H1>Second try with a small maxlen...</H1>")
global maxlen
maxlen = 50
@ -937,67 +937,67 @@ def print_exception(type=None, value=None, tb=None, limit=None):
if type is None:
type, value, tb = sys.exc_info()
import traceback
print
print "<H3>Traceback (most recent call last):</H3>"
print()
print("<H3>Traceback (most recent call last):</H3>")
list = traceback.format_tb(tb, limit) + \
traceback.format_exception_only(type, value)
print "<PRE>%s<B>%s</B></PRE>" % (
print("<PRE>%s<B>%s</B></PRE>" % (
escape("".join(list[:-1])),
escape(list[-1]),
)
))
del tb
def print_environ(environ=os.environ):
"""Dump the shell environment as HTML."""
keys = environ.keys()
keys.sort()
print
print "<H3>Shell Environment:</H3>"
print "<DL>"
print()
print("<H3>Shell Environment:</H3>")
print("<DL>")
for key in keys:
print "<DT>", escape(key), "<DD>", escape(environ[key])
print "</DL>"
print
print("<DT>", escape(key), "<DD>", escape(environ[key]))
print("</DL>")
print()
def print_form(form):
"""Dump the contents of a form as HTML."""
keys = form.keys()
keys.sort()
print
print "<H3>Form Contents:</H3>"
print()
print("<H3>Form Contents:</H3>")
if not keys:
print "<P>No form fields."
print "<DL>"
print("<P>No form fields.")
print("<DL>")
for key in keys:
print "<DT>" + escape(key) + ":",
print("<DT>" + escape(key) + ":", end=' ')
value = form[key]
print "<i>" + escape(repr(type(value))) + "</i>"
print "<DD>" + escape(repr(value))
print "</DL>"
print
print("<i>" + escape(repr(type(value))) + "</i>")
print("<DD>" + escape(repr(value)))
print("</DL>")
print()
def print_directory():
"""Dump the current directory as HTML."""
print
print "<H3>Current Working Directory:</H3>"
print()
print("<H3>Current Working Directory:</H3>")
try:
pwd = os.getcwd()
except os.error as msg:
print "os.error:", escape(str(msg))
print("os.error:", escape(str(msg)))
else:
print escape(pwd)
print
print(escape(pwd))
print()
def print_arguments():
print
print "<H3>Command Line Arguments:</H3>"
print
print sys.argv
print
print()
print("<H3>Command Line Arguments:</H3>")
print()
print(sys.argv)
print()
def print_environ_usage():
"""Dump a list of environment variables used by CGI as HTML."""
print """
print("""
<H3>These environment variables could have been set:</H3>
<UL>
<LI>AUTH_TYPE
@ -1036,7 +1036,7 @@ def print_environ_usage():
<LI>HTTP_REFERER
<LI>HTTP_USER_AGENT
</UL>
"""
""")
# Utilities

2
Lib/code.py
View file

@ -107,7 +107,7 @@ def runcode(self, code):
self.showtraceback()
else:
if softspace(sys.stdout, 0):
print
print()
def showsyntaxerror(self, filename=None):
"""Display the syntax error that just occurred.

38
Lib/compileall.py
View file

@ -33,11 +33,11 @@ def compile_dir(dir, maxlevels=10, ddir=None,
"""
if not quiet:
print 'Listing', dir, '...'
print('Listing', dir, '...')
try:
names = os.listdir(dir)
except os.error:
print "Can't list", dir
print("Can't list", dir)
names = []
names.sort()
success = 1
@ -60,18 +60,18 @@ def compile_dir(dir, maxlevels=10, ddir=None,
except os.error: ctime = 0
if (ctime > ftime) and not force: continue
if not quiet:
print 'Compiling', fullname, '...'
print('Compiling', fullname, '...')
try:
ok = py_compile.compile(fullname, None, dfile, True)
except KeyboardInterrupt:
raise KeyboardInterrupt
except py_compile.PyCompileError as err:
if quiet:
print 'Compiling', fullname, '...'
print err.msg
print('Compiling', fullname, '...')
print(err.msg)
success = 0
except IOError as e:
print "Sorry", e
print("Sorry", e)
success = 0
else:
if ok == 0:
@ -98,7 +98,7 @@ def compile_path(skip_curdir=1, maxlevels=0, force=0, quiet=0):
success = 1
for dir in sys.path:
if (not dir or dir == os.curdir) and skip_curdir:
print 'Skipping current directory'
print('Skipping current directory')
else:
success = success and compile_dir(dir, maxlevels, None,
force, quiet=quiet)
@ -110,16 +110,16 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], 'lfqd:x:')
except getopt.error as msg:
print msg
print "usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \
"[-x regexp] [directory ...]"
print "-l: don't recurse down"
print "-f: force rebuild even if timestamps are up-to-date"
print "-q: quiet operation"
print "-d destdir: purported directory name for error messages"
print " if no directory arguments, -l sys.path is assumed"
print "-x regexp: skip files matching the regular expression regexp"
print " the regexp is search for in the full path of the file"
print(msg)
print("usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \
"[-x regexp] [directory ...]")
print("-l: don't recurse down")
print("-f: force rebuild even if timestamps are up-to-date")
print("-q: quiet operation")
print("-d destdir: purported directory name for error messages")
print(" if no directory arguments, -l sys.path is assumed")
print("-x regexp: skip files matching the regular expression regexp")
print(" the regexp is search for in the full path of the file")
sys.exit(2)
maxlevels = 10
ddir = None
@ -136,7 +136,7 @@ def main():
rx = re.compile(a)
if ddir:
if len(args) != 1:
print "-d destdir require exactly one directory argument"
print("-d destdir require exactly one directory argument")
sys.exit(2)
success = 1
try:
@ -148,7 +148,7 @@ def main():
else:
success = compile_path()
except KeyboardInterrupt:
print "\n[interrupt]"
print("\n[interrupt]")
success = 0
return success

6
Lib/compiler/future.py
View file

@ -65,9 +65,9 @@ def find_futures(node):
from compiler import parseFile, walk
for file in sys.argv[1:]:
print file
print(file)
tree = parseFile(file)
v = FutureParser()
walk(tree, v)
print v.found
print
print(v.found)
print()

24
Lib/compiler/pyassem.py
View file

@ -19,10 +19,10 @@ def __init__(self):
def startBlock(self, block):
if self._debug:
if self.current:
print "end", repr(self.current)
print " next", self.current.next
print " ", self.current.get_children()
print repr(block)
print("end", repr(self.current))
print(" next", self.current.next)
print(" ", self.current.get_children())
print(repr(block))
self.current = block
def nextBlock(self, block=None):
@ -68,7 +68,7 @@ def _disable_debug(self):
def emit(self, *inst):
if self._debug:
print "\t", inst
print("\t", inst)
if inst[0] in ['RETURN_VALUE', 'YIELD_VALUE']:
self.current.addOutEdge(self.exit)
if len(inst) == 2 and isinstance(inst[1], Block):
@ -400,12 +400,12 @@ def dump(self, io=None):
for t in self.insts:
opname = t[0]
if opname == "SET_LINENO":
print
print()
if len(t) == 1:
print "\t", "%3d" % pc, opname
print("\t", "%3d" % pc, opname)
pc = pc + 1
else:
print "\t", "%3d" % pc, opname, t[1]
print("\t", "%3d" % pc, opname, t[1])
pc = pc + 3
if io:
sys.stdout = save
@ -601,8 +601,8 @@ def makeByteCode(self):
try:
lnotab.addCode(self.opnum[opname], lo, hi)
except ValueError:
print opname, oparg
print self.opnum[opname], lo, hi
print(opname, oparg)
print(self.opnum[opname], lo, hi)
raise
self.stage = DONE
@ -744,7 +744,7 @@ def findDepth(self, insts, debug=0):
for i in insts:
opname = i[0]
if debug:
print i,
print(i, end=' ')
delta = self.effect.get(opname, None)
if delta is not None:
depth = depth + delta
@ -763,7 +763,7 @@ def findDepth(self, insts, debug=0):
if depth > maxDepth:
maxDepth = depth
if debug:
print depth, maxDepth
print(depth, maxDepth)
return maxDepth
effect = {

10
Lib/compiler/pycodegen.py
View file

@ -112,7 +112,7 @@ def compile(self, display=0):
gen = ModuleCodeGenerator(tree)
if display:
import pprint
print pprint.pprint(tree)
print(pprint.pprint(tree))
self.code = gen.getCode()
def dump(self, f):
@ -1018,7 +1018,7 @@ def visitAssName(self, node):
self.set_lineno(node)
self.delName(node.name)
else:
print "oops", node.flags
print("oops", node.flags)
def visitAssAttr(self, node):
self.visit(node.expr)
@ -1027,8 +1027,8 @@ def visitAssAttr(self, node):
elif node.flags == 'OP_DELETE':
self.emit('DELETE_ATTR', self.mangle(node.attrname))
else:
print "warning: unexpected flags:", node.flags
print node
print("warning: unexpected flags:", node.flags)
print(node)
def _visitAssSequence(self, node, op='UNPACK_SEQUENCE'):
if findOp(node) != 'OP_DELETE':
@ -1189,7 +1189,7 @@ def visitSlice(self, node, aug_flag=None):
elif node.flags == 'OP_DELETE':
self.emit('DELETE_SLICE+%d' % slice)
else:
print "weird slice", node.flags
print("weird slice", node.flags)
raise
def visitSubscript(self, node, aug_flag=None):

30
Lib/compiler/symbols.py
View file

@ -76,12 +76,12 @@ def get_children(self):
return self.children
def DEBUG(self):
print >> sys.stderr, self.name, self.nested and "nested" or ""
print >> sys.stderr, "\tglobals: ", self.globals
print >> sys.stderr, "\tcells: ", self.cells
print >> sys.stderr, "\tdefs: ", self.defs
print >> sys.stderr, "\tuses: ", self.uses
print >> sys.stderr, "\tfrees:", self.frees
print(self.name, self.nested and "nested" or "", file=sys.stderr)
print("\tglobals: ", self.globals, file=sys.stderr)
print("\tcells: ", self.cells, file=sys.stderr)
print("\tdefs: ", self.defs, file=sys.stderr)
print("\tuses: ", self.uses, file=sys.stderr)
print("\tfrees:", self.frees, file=sys.stderr)
def check_name(self, name):
"""Return scope of name.
@ -429,7 +429,7 @@ def get_names(syms):
if not (s.startswith('_[') or s.startswith('.'))]
for file in sys.argv[1:]:
print file
print(file)
f = open(file)
buf = f.read()
f.close()
@ -443,10 +443,10 @@ def get_names(syms):
names2 = s.scopes[tree].get_names()
if not list_eq(mod_names, names2):
print
print "oops", file
print sorted(mod_names)
print sorted(names2)
print()
print("oops", file)
print(sorted(mod_names))
print(sorted(names2))
sys.exit(-1)
d = {}
@ -460,11 +460,11 @@ def get_names(syms):
l = [sc for sc in scopes
if sc.name == s.get_name()]
if len(l) > 1:
print "skipping", s.get_name()
print("skipping", s.get_name())
else:
if not list_eq(get_names(s.get_namespace()),
l[0].get_names()):
print s.get_name()
print sorted(get_names(s.get_namespace()))
print sorted(l[0].get_names())
print(s.get_name())
print(sorted(get_names(s.get_namespace())))
print(sorted(l[0].get_names()))
sys.exit(-1)

2
Lib/compiler/syntax.py
View file

@ -32,7 +32,7 @@ def __init__(self, multi=None):
def error(self, node, msg):
self.errors = self.errors + 1
if self.multi is not None:
print "%s:%s: %s" % (node.filename, node.lineno, msg)
print("%s:%s: %s" % (node.filename, node.lineno, msg))
else:
raise SyntaxError, "%s (%s:%s)" % (msg, node.filename, node.lineno)

2
Lib/compiler/transformer.py
View file

@ -86,7 +86,7 @@ def Node(*args):
try:
return nodes[kind](*args[1:])
except TypeError:
print nodes[kind], len(args), args
print(nodes[kind], len(args), args)
raise
else:
raise WalkerError, "Can't find appropriate Node type: %s" % str(args)

16
Lib/compiler/visitor.py
View file

@ -79,20 +79,20 @@ def dispatch(self, node, *args):
meth = getattr(self.visitor, 'visit' + className, 0)
self._cache[node.__class__] = meth
if self.VERBOSE > 1:
print "dispatch", className, (meth and meth.__name__ or '')
print("dispatch", className, (meth and meth.__name__ or ''))
if meth:
meth(node, *args)
elif self.VERBOSE > 0:
klass = node.__class__
if klass not in self.examples:
self.examples[klass] = klass
print
print self.visitor
print klass
print()
print(self.visitor)
print(klass)
for attr in dir(node):
if attr[0] != '_':
print "\t", "%-12.12s" % attr, getattr(node, attr)
print
print("\t", "%-12.12s" % attr, getattr(node, attr))
print()
return self.default(node, *args)
# XXX this is an API change
@ -107,7 +107,7 @@ def walk(tree, visitor, walker=None, verbose=None):
return walker.visitor
def dumpNode(node):
print node.__class__
print(node.__class__)
for attr in dir(node):
if attr[0] != '_':
print "\t", "%-10.10s" % attr, getattr(node, attr)
print("\t", "%-10.10s" % attr, getattr(node, attr))

34
Lib/copy.py
View file

@ -318,11 +318,11 @@ def _test():
l = [None, 1, 2, 3.14, 'xyzzy', (1, 2), [3.14, 'abc'],
{'abc': 'ABC'}, (), [], {}]
l1 = copy(l)
print l1==l
print(l1==l)
l1 = map(copy, l)
print l1==l
print(l1==l)
l1 = deepcopy(l)
print l1==l
print(l1==l)
class C:
def __init__(self, arg=None):
self.a = 1
@ -346,26 +346,26 @@ def __deepcopy__(self, memo=None):
c = C('argument sketch')
l.append(c)
l2 = copy(l)
print l == l2
print l
print l2
print(l == l2)
print(l)
print(l2)
l2 = deepcopy(l)
print l == l2
print l
print l2
print(l == l2)
print(l)
print(l2)
l.append({l[1]: l, 'xyz': l[2]})
l3 = copy(l)
import repr
print map(repr.repr, l)
print map(repr.repr, l1)
print map(repr.repr, l2)
print map(repr.repr, l3)
print(map(repr.repr, l))
print(map(repr.repr, l1))
print(map(repr.repr, l2))
print(map(repr.repr, l3))
l3 = deepcopy(l)
import repr
print map(repr.repr, l)
print map(repr.repr, l1)
print map(repr.repr, l2)
print map(repr.repr, l3)
print(map(repr.repr, l))
print(map(repr.repr, l1))
print(map(repr.repr, l2))
print(map(repr.repr, l3))
if __name__ == '__main__':
_test()

12
Lib/ctypes/test/__init__.py
View file

@ -60,10 +60,10 @@ def get_tests(package, mask, verbosity):
except ResourceDenied as detail:
skipped.append(modname)
if verbosity > 1:
print >> sys.stderr, "Skipped %s: %s" % (modname, detail)
print("Skipped %s: %s" % (modname, detail), file=sys.stderr)
continue
except Exception as detail:
print >> sys.stderr, "Warning: could not import %s: %s" % (modname, detail)
print("Warning: could not import %s: %s" % (modname, detail), file=sys.stderr)
continue
for name in dir(mod):
if name.startswith("_"):
@ -74,7 +74,7 @@ def get_tests(package, mask, verbosity):
return skipped, tests
def usage():
print __doc__
print(__doc__)
return 1
def test_with_refcounts(runner, verbosity, testcase):
@ -106,9 +106,9 @@ def cleanup():
cleanup()
refcounts[i] = sys.gettotalrefcount() - rc
if filter(None, refcounts):
print "%s leaks:\n\t" % testcase, refcounts
print("%s leaks:\n\t" % testcase, refcounts)
elif verbosity:
print "%s: ok." % testcase
print("%s: ok." % testcase)
class TestRunner(unittest.TextTestRunner):
def run(self, test, skipped):
@ -166,7 +166,7 @@ def main(*packages):
try:
sys.gettotalrefcount
except AttributeError:
print >> sys.stderr, "-r flag requires Python debug build"
print("-r flag requires Python debug build", file=sys.stderr)
return -1
search_leaks = True
elif flag == "-u":

2
Lib/ctypes/test/test_byteswap.py
View file

@ -15,7 +15,7 @@ def bin(s):
class Test(unittest.TestCase):
def X_test(self):
print >> sys.stderr, sys.byteorder
print(sys.byteorder, file=sys.stderr)
for i in range(32):
bits = BITS()
setattr(bits, "i%s" % i, 1)

4
Lib/ctypes/test/test_find.py
View file

@ -22,12 +22,12 @@
## print, for debugging
if is_resource_enabled("printing"):
if lib_gl or lib_glu or lib_glut or lib_gle:
print "OpenGL libraries:"
print("OpenGL libraries:")
for item in (("GL", lib_gl),
("GLU", lib_glu),
("glut", lib_glut),
("gle", lib_gle)):
print "\t", item
print("\t", item)
# On some systems, loading the OpenGL libraries needs the RTLD_GLOBAL mode.

14
Lib/ctypes/test/test_keeprefs.py
View file

@ -100,13 +100,13 @@ class X(Structure):
x = X()
i = c_char_p("abc def")
from sys import getrefcount as grc
print "2?", grc(i)
print("2?", grc(i))
x.p = pointer(i)
print "3?", grc(i)
print("3?", grc(i))
for i in range(320):
c_int(99)
x.p[0]
print x.p[0]
print(x.p[0])
## del x
## print "2?", grc(i)
## del i
@ -115,14 +115,14 @@ class X(Structure):
for i in range(320):
c_int(99)
x.p[0]
print x.p[0]
print x.p.contents
print(x.p[0])
print(x.p.contents)
## print x._objects
x.p[0] = "spam spam"
## print x.p[0]
print "+" * 42
print x._objects
print("+" * 42)
print(x._objects)
class PointerToStructure(unittest.TestCase):
def test(self):

6
Lib/ctypes/test/test_loading.py
View file

@ -15,7 +15,7 @@
libc_name = find_library("c")
if is_resource_enabled("printing"):
print "libc_name is", libc_name
print("libc_name is", libc_name)
class LoaderTest(unittest.TestCase):
@ -44,8 +44,8 @@ def test_find(self):
if os.name in ("nt", "ce"):
def test_load_library(self):
if is_resource_enabled("printing"):
print find_library("kernel32")
print find_library("user32")
print(find_library("kernel32"))
print(find_library("user32"))
if os.name == "nt":
windll.kernel32.GetModuleHandleW

2
Lib/ctypes/test/test_numbers.py
View file

@ -192,7 +192,7 @@ def run_test(rep, msg, func, arg=None):
for i in items:
func(); func(); func(); func(); func()
stop = clock()
print "%15s: %.2f us" % (msg, ((stop-start)*1e6/5/rep))
print("%15s: %.2f us" % (msg, ((stop-start)*1e6/5/rep)))
def check_perf():
# Construct 5 objects

2
Lib/ctypes/test/test_strings.py
View file

@ -189,7 +189,7 @@ def run_test(rep, msg, func, arg):
for i in items:
func(arg); func(arg); func(arg); func(arg); func(arg)
stop = clock()
print "%20s: %.2f us" % (msg, ((stop-start)*1e6/5/rep))
print("%20s: %.2f us" % (msg, ((stop-start)*1e6/5/rep)))
def check_perf():
# Construct 5 objects

26
Lib/ctypes/util.py
View file

@ -125,15 +125,15 @@ def find_library(name):
def test():
from ctypes import cdll
if os.name == "nt":
print cdll.msvcrt
print cdll.load("msvcrt")
print find_library("msvcrt")
print(cdll.msvcrt)
print(cdll.load("msvcrt"))
print(find_library("msvcrt"))
if os.name == "posix":
# find and load_version
print find_library("m")
print find_library("c")
print find_library("bz2")
print(find_library("m"))
print(find_library("c"))
print(find_library("bz2"))
# getattr
## print cdll.m
@ -141,14 +141,14 @@ def test():
# load
if sys.platform == "darwin":
print cdll.LoadLibrary("libm.dylib")
print cdll.LoadLibrary("libcrypto.dylib")
print cdll.LoadLibrary("libSystem.dylib")
print cdll.LoadLibrary("System.framework/System")
print(cdll.LoadLibrary("libm.dylib"))
print(cdll.LoadLibrary("libcrypto.dylib"))
print(cdll.LoadLibrary("libSystem.dylib"))
print(cdll.LoadLibrary("System.framework/System"))
else:
print cdll.LoadLibrary("libm.so")
print cdll.LoadLibrary("libcrypt.so")
print find_library("crypt")
print(cdll.LoadLibrary("libm.so"))
print(cdll.LoadLibrary("libcrypt.so"))
print(find_library("crypt"))
if __name__ == "__main__":
test()

2
Lib/curses/has_key.py
View file

@ -189,4 +189,4 @@ def has_key(ch):
% (_curses.keyname( key ), system, python) )
finally:
_curses.endwin()
for i in L: print i
for i in L: print(i)

2
Lib/curses/textpad.py
View file

@ -170,4 +170,4 @@ def test_editbox(stdscr):
return Textbox(win).edit()
str = curses.wrapper(test_editbox)
print 'Contents of text box:', repr(str)
print('Contents of text box:', repr(str))

30
Lib/difflib.py
View file

@ -76,7 +76,7 @@ class SequenceMatcher:
sequences. As a rule of thumb, a .ratio() value over 0.6 means the
sequences are close matches:
>>> print round(s.ratio(), 3)
>>> print(round(s.ratio(), 3))
0.866
>>>
@ -84,7 +84,7 @@ class SequenceMatcher:
.get_matching_blocks() is handy:
>>> for block in s.get_matching_blocks():
... print "a[%d] and b[%d] match for %d elements" % block
... print("a[%d] and b[%d] match for %d elements" % block)
a[0] and b[0] match for 8 elements
a[8] and b[17] match for 21 elements
a[29] and b[38] match for 0 elements
@ -97,7 +97,7 @@ class SequenceMatcher:
use .get_opcodes():
>>> for opcode in s.get_opcodes():
... print "%6s a[%d:%d] b[%d:%d]" % opcode
... print("%6s a[%d:%d] b[%d:%d]" % opcode)
equal a[0:8] b[0:8]
insert a[8:8] b[8:17]
equal a[8:29] b[17:38]
@ -545,8 +545,8 @@ def get_opcodes(self):
>>> b = "abycdf"
>>> s = SequenceMatcher(None, a, b)
>>> for tag, i1, i2, j1, j2 in s.get_opcodes():
... print ("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
... (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2]))
... print(("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
... (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2])))
delete a[0:1] (q) b[0:0] ()
equal a[1:3] (ab) b[0:2] (ab)
replace a[3:4] (x) b[2:3] (y)
@ -832,7 +832,7 @@ class Differ:
As a single multi-line string it looks like this:
>>> print ''.join(result),
>>> print(''.join(result), end="")
1. Beautiful is better than ugly.
- 2. Explicit is better than implicit.
- 3. Simple is better than complex.
@ -889,8 +889,9 @@ def compare(self, a, b):
Example:
>>> print ''.join(Differ().compare('one\ntwo\nthree\n'.splitlines(1),
>>> print(''.join(Differ().compare('one\ntwo\nthree\n'.splitlines(1),
... 'ore\ntree\nemu\n'.splitlines(1))),
... end="")
- one
? ^
+ ore
@ -950,7 +951,7 @@ def _fancy_replace(self, a, alo, ahi, b, blo, bhi):
>>> d = Differ()
>>> results = d._fancy_replace(['abcDefghiJkl\n'], 0, 1,
... ['abcdefGhijkl\n'], 0, 1)
>>> print ''.join(results),
>>> print(''.join(results), end="")
- abcDefghiJkl
? ^ ^ ^
+ abcdefGhijkl
@ -1058,7 +1059,7 @@ def _qformat(self, aline, bline, atags, btags):
>>> d = Differ()
>>> results = d._qformat('\tabcDefghiJkl\n', '\t\tabcdefGhijkl\n',
... ' ^ ^ ^ ', '+ ^ ^ ^ ')
>>> for line in results: print repr(line)
>>> for line in results: print(repr(line))
...
'- \tabcDefghiJkl\n'
'? \t ^ ^ ^\n'
@ -1164,7 +1165,7 @@ def unified_diff(a, b, fromfile='', tofile='', fromfiledate='',
... 'zero one tree four'.split(), 'Original', 'Current',
... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:20:52 2003',
... lineterm=''):
... print line
... print(line)
--- Original Sat Jan 26 23:30:50 1991
+++ Current Fri Jun 06 10:20:52 2003
@@ -1,4 +1,4 @@
@ -1223,9 +1224,10 @@ def context_diff(a, b, fromfile='', tofile='',
Example:
>>> print ''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
>>> print(''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
... 'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current',
... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:22:46 2003')),
... end="")
*** Original Sat Jan 26 23:30:50 1991
--- Current Fri Jun 06 10:22:46 2003
***************
@ -1295,7 +1297,7 @@ def ndiff(a, b, linejunk=None, charjunk=IS_CHARACTER_JUNK):
>>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
... 'ore\ntree\nemu\n'.splitlines(1))
>>> print ''.join(diff),
>>> print(''.join(diff), end="")
- one
? ^
+ ore
@ -1992,11 +1994,11 @@ def restore(delta, which):
>>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
... 'ore\ntree\nemu\n'.splitlines(1))
>>> diff = list(diff)
>>> print ''.join(restore(diff, 1)),
>>> print(''.join(restore(diff, 1)), end="")
one
two
three
>>> print ''.join(restore(diff, 2)),
>>> print(''.join(restore(diff, 2)), end="")
ore
tree
emu

72
Lib/dis.py
View file

@ -30,12 +30,12 @@ def dis(x=None):
types.FunctionType,
types.CodeType,
types.ClassType):
print "Disassembly of %s:" % name
print("Disassembly of %s:" % name)
try:
dis(x1)
except TypeError as msg:
print "Sorry:", msg
print
print("Sorry:", msg)
print()
elif hasattr(x, 'co_code'):
disassemble(x)
elif isinstance(x, str):
@ -69,17 +69,17 @@ def disassemble(co, lasti=-1):
op = ord(c)
if i in linestarts:
if i > 0:
print
print "%3d" % linestarts[i],
print()
print("%3d" % linestarts[i], end=' ')
else:
print ' ',
print(' ', end=' ')
if i == lasti: print '-->',
else: print ' ',
if i in labels: print '>>',
else: print ' ',
print repr(i).rjust(4),
print opname[op].ljust(20),
if i == lasti: print('-->', end=' ')
else: print(' ', end=' ')
if i in labels: print('>>', end=' ')
else: print(' ', end=' ')
print(repr(i).rjust(4), end=' ')
print(opname[op].ljust(20), end=' ')
i = i+1
if op >= HAVE_ARGUMENT:
oparg = ord(code[i]) + ord(code[i+1])*256 + extended_arg
@ -87,22 +87,22 @@ def disassemble(co, lasti=-1):
i = i+2
if op == EXTENDED_ARG:
extended_arg = oparg*65536
print repr(oparg).rjust(5),
print(repr(oparg).rjust(5), end=' ')
if op in hasconst:
print '(' + repr(co.co_consts[oparg]) + ')',
print('(' + repr(co.co_consts[oparg]) + ')', end=' ')
elif op in hasname:
print '(' + co.co_names[oparg] + ')',
print('(' + co.co_names[oparg] + ')', end=' ')
elif op in hasjrel:
print '(to ' + repr(i + oparg) + ')',
print('(to ' + repr(i + oparg) + ')', end=' ')
elif op in haslocal:
print '(' + co.co_varnames[oparg] + ')',
print('(' + co.co_varnames[oparg] + ')', end=' ')
elif op in hascompare:
print '(' + cmp_op[oparg] + ')',
print('(' + cmp_op[oparg] + ')', end=' ')
elif op in hasfree:
if free is None:
free = co.co_cellvars + co.co_freevars
print '(' + free[oparg] + ')',
print
print('(' + free[oparg] + ')', end=' ')
print()
def disassemble_string(code, lasti=-1, varnames=None, names=None,
constants=None):
@ -112,37 +112,37 @@ def disassemble_string(code, lasti=-1, varnames=None, names=None,
while i < n:
c = code[i]
op = ord(c)
if i == lasti: print '-->',
else: print ' ',
if i in labels: print '>>',
else: print ' ',
print repr(i).rjust(4),
print opname[op].ljust(15),
if i == lasti: print('-->', end=' ')
else: print(' ', end=' ')
if i in labels: print('>>', end=' ')
else: print(' ', end=' ')
print(repr(i).rjust(4), end=' ')
print(opname[op].ljust(15), end=' ')
i = i+1
if op >= HAVE_ARGUMENT:
oparg = ord(code[i]) + ord(code[i+1])*256
i = i+2
print repr(oparg).rjust(5),
print(repr(oparg).rjust(5), end=' ')
if op in hasconst:
if constants:
print '(' + repr(constants[oparg]) + ')',
print('(' + repr(constants[oparg]) + ')', end=' ')
else:
print '(%d)'%oparg,
print('(%d)'%oparg, end=' ')
elif op in hasname:
if names is not None:
print '(' + names[oparg] + ')',
print('(' + names[oparg] + ')', end=' ')
else:
print '(%d)'%oparg,
print('(%d)'%oparg, end=' ')
elif op in hasjrel:
print '(to ' + repr(i + oparg) + ')',
print('(to ' + repr(i + oparg) + ')', end=' ')
elif op in haslocal:
if varnames:
print '(' + varnames[oparg] + ')',
print('(' + varnames[oparg] + ')', end=' ')
else:
print '(%d)' % oparg,
print('(%d)' % oparg, end=' ')
elif op in hascompare:
print '(' + cmp_op[oparg] + ')',
print
print('(' + cmp_op[oparg] + ')', end=' ')
print()
disco = disassemble # XXX For backwards compatibility

2
Lib/distutils/bcppcompiler.py
View file

@ -392,7 +392,7 @@ def preprocess (self,
try:
self.spawn(pp_args)
except DistutilsExecError as msg:
print msg
print(msg)
raise CompileError, msg
# preprocess()

2
Lib/distutils/ccompiler.py
View file

@ -1026,7 +1026,7 @@ def announce (self, msg, level=1):
def debug_print (self, msg):
from distutils.debug import DEBUG
if DEBUG:
print msg
print(msg)
def warn (self, msg):
sys.stderr.write ("warning: %s\n" % msg)

8
Lib/distutils/cmd.py
View file

@ -163,14 +163,14 @@ def dump_options (self, header=None, indent=""):
from distutils.fancy_getopt import longopt_xlate
if header is None:
header = "command options for '%s':" % self.get_command_name()
print indent + header
print(indent + header)
indent = indent + " "
for (option, _, _) in self.user_options:
option = string.translate(option, longopt_xlate)
if option[-1] == "=":
option = option[:-1]
value = getattr(self, option)
print indent + "%s = %s" % (option, value)
print(indent + "%s = %s" % (option, value))
def run (self):
@ -199,7 +199,7 @@ def debug_print (self, msg):
"""
from distutils.debug import DEBUG
if DEBUG:
print msg
print(msg)
sys.stdout.flush()
@ -475,4 +475,4 @@ def get_outputs (self):
if __name__ == "__main__":
print "ok"
print("ok")

10
Lib/distutils/command/bdist_rpm.py
View file

@ -267,11 +267,11 @@ def finalize_package_data (self):
def run (self):
if DEBUG:
print "before _get_package_data():"
print "vendor =", self.vendor
print "packager =", self.packager
print "doc_files =", self.doc_files
print "changelog =", self.changelog
print("before _get_package_data():")
print("vendor =", self.vendor)
print("packager =", self.packager)
print("doc_files =", self.doc_files)
print("changelog =", self.changelog)
# make directories
if self.spec_only:

4
Lib/distutils/command/config.py
View file

@ -359,9 +359,9 @@ def check_header (self, header, include_dirs=None,
def dump_file (filename, head=None):
if head is None:
print filename + ":"
print(filename + ":")
else:
print head
print(head)
file = open(filename)
sys.stdout.write(file.read())

6
Lib/distutils/command/install.py
View file

@ -292,7 +292,7 @@ def finalize_options (self):
if DEBUG:
from pprint import pprint
print "config vars:"
print("config vars:")
pprint(self.config_vars)
# Expand "~" and configuration variables in the installation
@ -347,7 +347,7 @@ def finalize_options (self):
def dump_dirs (self, msg):
if DEBUG:
from distutils.fancy_getopt import longopt_xlate
print msg + ":"
print(msg + ":")
for opt in self.user_options:
opt_name = opt[0]
if opt_name[-1] == "=":
@ -359,7 +359,7 @@ def dump_dirs (self, msg):
else:
opt_name = string.translate(opt_name, longopt_xlate)
val = getattr(self, opt_name)
print " %s: %s" % (opt_name, val)
print(" %s: %s" % (opt_name, val))
def finalize_unix (self):

30
Lib/distutils/command/register.py
View file

@ -86,14 +86,14 @@ def classifiers(self):
''' Fetch the list of classifiers from the server.
'''
response = urllib2.urlopen(self.repository+'?:action=list_classifiers')
print response.read()
print(response.read())
def verify_metadata(self):
''' Send the metadata to the package index server to be checked.
'''
# send the info to the server and report the result
(code, result) = self.post_to_server(self.build_post_data('verify'))
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
def send_metadata(self):
''' Send the metadata to the package index server.
@ -128,7 +128,7 @@ def send_metadata(self):
if os.environ.has_key('HOME'):
rc = os.path.join(os.environ['HOME'], '.pypirc')
if os.path.exists(rc):
print 'Using PyPI login from %s'%rc
print('Using PyPI login from %s'%rc)
config = ConfigParser.ConfigParser()
config.read(rc)
username = config.get('server-login', 'username')
@ -138,17 +138,17 @@ def send_metadata(self):
# get the user's login info
choices = '1 2 3 4'.split()
while choice not in choices:
print '''We need to know who you are, so please choose either:
print('''We need to know who you are, so please choose either:
1. use your existing login,
2. register as a new user,
3. have the server generate a new password for you (and email it to you), or
4. quit
Your selection [default 1]: ''',
Your selection [default 1]: ''', end=' ')
choice = raw_input()
if not choice:
choice = '1'
elif choice not in choices:
print 'Please choose one of the four options!'
print('Please choose one of the four options!')
if choice == '1':
# get the username and password
@ -165,13 +165,13 @@ def send_metadata(self):
# send the info to the server and report the result
code, result = self.post_to_server(self.build_post_data('submit'),
auth)
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
# possibly save the login
if os.environ.has_key('HOME') and config is None and code == 200:
rc = os.path.join(os.environ['HOME'], '.pypirc')
print 'I can store your PyPI login so future submissions will be faster.'
print '(the login will be stored in %s)'%rc
print('I can store your PyPI login so future submissions will be faster.')
print('(the login will be stored in %s)'%rc)
choice = 'X'
while choice.lower() not in 'yn':
choice = raw_input('Save your login (y/N)?')
@ -200,22 +200,22 @@ def send_metadata(self):
if data['password'] != data['confirm']:
data['password'] = ''
data['confirm'] = None
print "Password and confirm don't match!"
print("Password and confirm don't match!")
while not data['email']:
data['email'] = raw_input(' EMail: ')
code, result = self.post_to_server(data)
if code != 200:
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
else:
print 'You will receive an email shortly.'
print 'Follow the instructions in it to complete registration.'
print('You will receive an email shortly.')
print('Follow the instructions in it to complete registration.')
elif choice == '3':
data = {':action': 'password_reset'}
data['email'] = ''
while not data['email']:
data['email'] = raw_input('Your email address: ')
code, result = self.post_to_server(data)
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
def build_post_data(self, action):
# figure the data to send - the metadata plus some additional
@ -295,5 +295,5 @@ def post_to_server(self, data, auth=None):
data = result.read()
result = 200, 'OK'
if self.show_response:
print '-'*75, data, '-'*75
print('-'*75, data, '-'*75)
return result

2
Lib/distutils/command/upload.py
View file

@ -196,4 +196,4 @@ def upload_file(self, command, pyversion, filename):
self.announce('Upload failed (%s): %s' % (r.status, r.reason),
log.ERROR)
if self.show_response:
print '-'*75, r.read(), '-'*75
print('-'*75, r.read(), '-'*75)

4
Lib/distutils/core.py
View file

@ -125,7 +125,7 @@ class found in 'cmdclass' is used in place of the default, which is
dist.parse_config_files()
if DEBUG:
print "options (after parsing config files):"
print("options (after parsing config files):")
dist.dump_option_dicts()
if _setup_stop_after == "config":
@ -139,7 +139,7 @@ class found in 'cmdclass' is used in place of the default, which is
raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
if DEBUG:
print "options (after parsing command line):"
print("options (after parsing command line):")
dist.dump_option_dicts()
if _setup_stop_after == "commandline":

48
Lib/distutils/dist.py
View file

@ -290,22 +290,22 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
commands.sort()
if header is not None:
print indent + header
print(indent + header)
indent = indent + " "
if not commands:
print indent + "no commands known yet"
print(indent + "no commands known yet")
return
for cmd_name in commands:
opt_dict = self.command_options.get(cmd_name)
if opt_dict is None:
print indent + "no option dict for '%s' command" % cmd_name
print(indent + "no option dict for '%s' command" % cmd_name)
else:
print indent + "option dict for '%s' command:" % cmd_name
print(indent + "option dict for '%s' command:" % cmd_name)
out = pformat(opt_dict)
for line in string.split(out, "\n"):
print indent + " " + line
print(indent + " " + line)
# dump_option_dicts ()
@ -365,11 +365,11 @@ def parse_config_files (self, filenames=None):
if filenames is None:
filenames = self.find_config_files()
if DEBUG: print "Distribution.parse_config_files():"
if DEBUG: print("Distribution.parse_config_files():")
parser = ConfigParser()
for filename in filenames:
if DEBUG: print " reading", filename
if DEBUG: print(" reading", filename)
parser.read(filename)
for section in parser.sections():
options = parser.options(section)
@ -636,14 +636,14 @@ def _show_help (self,
options = self.global_options
parser.set_option_table(options)
parser.print_help(self.common_usage + "\nGlobal options:")
print
print()
if display_options:
parser.set_option_table(self.display_options)
parser.print_help(
"Information display options (just display " +
"information, ignore any commands)")
print
print()
for command in self.commands:
if type(command) is ClassType and issubclass(command, Command):
@ -657,9 +657,9 @@ def _show_help (self,
else:
parser.set_option_table(klass.user_options)
parser.print_help("Options for '%s' command:" % klass.__name__)
print
print()
print gen_usage(self.script_name)
print(gen_usage(self.script_name))
return
# _show_help ()
@ -678,8 +678,8 @@ def handle_display_options (self, option_order):
# we ignore "foo bar").
if self.help_commands:
self.print_commands()
print
print gen_usage(self.script_name)
print()
print(gen_usage(self.script_name))
return 1
# If user supplied any of the "display metadata" options, then
@ -695,12 +695,12 @@ def handle_display_options (self, option_order):
opt = translate_longopt(opt)
value = getattr(self.metadata, "get_"+opt)()
if opt in ['keywords', 'platforms']:
print string.join(value, ',')
print(string.join(value, ','))
elif opt in ('classifiers', 'provides', 'requires',
'obsoletes'):
print string.join(value, '\n')
print(string.join(value, '\n'))
else:
print value
print(value)
any_display_options = 1
return any_display_options
@ -712,7 +712,7 @@ def print_command_list (self, commands, header, max_length):
'print_commands()'.
"""
print header + ":"
print(header + ":")
for cmd in commands:
klass = self.cmdclass.get(cmd)
@ -723,7 +723,7 @@ def print_command_list (self, commands, header, max_length):
except AttributeError:
description = "(no description available)"
print " %-*s %s" % (max_length, cmd, description)
print(" %-*s %s" % (max_length, cmd, description))
# print_command_list ()
@ -757,7 +757,7 @@ def print_commands (self):
"Standard commands",
max_length)
if extra_commands:
print
print()
self.print_command_list(extra_commands,
"Extra commands",
max_length)
@ -862,8 +862,8 @@ def get_command_obj (self, command, create=1):
cmd_obj = self.command_obj.get(command)
if not cmd_obj and create:
if DEBUG:
print "Distribution.get_command_obj(): " \
"creating '%s' command object" % command
print("Distribution.get_command_obj(): " \
"creating '%s' command object" % command)
klass = self.get_command_class(command)
cmd_obj = self.command_obj[command] = klass(self)
@ -893,9 +893,9 @@ def _set_command_options (self, command_obj, option_dict=None):
if option_dict is None:
option_dict = self.get_option_dict(command_name)
if DEBUG: print " setting options for '%s' command:" % command_name
if DEBUG: print(" setting options for '%s' command:" % command_name)
for (option, (source, value)) in option_dict.items():
if DEBUG: print " %s = %s (from %s)" % (option, value, source)
if DEBUG: print(" %s = %s (from %s)" % (option, value, source))
try:
bool_opts = map(translate_longopt, command_obj.boolean_options)
except AttributeError:
@ -1219,4 +1219,4 @@ def fix_help_options (options):
if __name__ == "__main__":
dist = Distribution()
print "ok"
print("ok")

6
Lib/distutils/fancy_getopt.py
View file

@ -497,6 +497,6 @@ def __init__ (self, options=[]):
say, "How should I know?"].)"""
for w in (10, 20, 30, 40):
print "width: %d" % w
print string.join(wrap_text(text, w), "\n")
print
print("width: %d" % w)
print(string.join(wrap_text(text, w), "\n"))
print()

2
Lib/distutils/filelist.py
View file

@ -53,7 +53,7 @@ def debug_print (self, msg):
"""
from distutils.debug import DEBUG
if DEBUG:
print msg
print(msg)
# -- List-like methods ---------------------------------------------

4
Lib/distutils/log.py
View file

@ -23,9 +23,9 @@ def _log(self, level, msg, args):
if not args:
# msg may contain a '%'. If args is empty,
# don't even try to string-format
print msg
print(msg)
else:
print msg % args
print(msg % args)
sys.stdout.flush()
def log(self, level, msg, *args):

4
Lib/distutils/mwerkscompiler.py
View file

@ -160,9 +160,9 @@ def link (self,
settings['libraries'] = libraries
settings['extrasearchdirs'] = sourcefiledirs + include_dirs + library_dirs
if self.dry_run:
print 'CALLING LINKER IN', os.getcwd()
print('CALLING LINKER IN', os.getcwd())
for key, value in settings.items():
print '%20.20s %s'%(key, value)
print('%20.20s %s'%(key, value))
return
# Build the export file
exportfilename = os.path.join(build_temp, exportname)

2
Lib/distutils/spawn.py
View file

@ -109,7 +109,7 @@ def _spawn_os2 (cmd,
"command '%s' failed: %s" % (cmd[0], exc[-1])
if rc != 0:
# and this reflects the command running but failing
print "command '%s' failed with exit status %d" % (cmd[0], rc)
print("command '%s' failed with exit status %d" % (cmd[0], rc))
raise DistutilsExecError, \
"command '%s' failed with exit status %d" % (cmd[0], rc)

4
Lib/distutils/tests/test_dist.py
View file

@ -74,8 +74,8 @@ def test_command_packages_configfile(self):
sys.argv.append("build")
f = open(TESTFN, "w")
try:
print >>f, "[global]"
print >>f, "command_packages = foo.bar, splat"
print("[global]", file=f)
print("command_packages = foo.bar, splat", file=f)
f.close()
d = self.create_distribution([TESTFN])
self.assertEqual(d.get_command_packages(),

12
Lib/distutils/text_file.py
View file

@ -342,13 +342,13 @@ def test_input (count, description, file, expected_result):
result = file.readlines ()
# result = string.join (result, '')
if result == expected_result:
print "ok %d (%s)" % (count, description)
print("ok %d (%s)" % (count, description))
else:
print "not ok %d (%s):" % (count, description)
print "** expected:"
print expected_result
print "** received:"
print result
print("not ok %d (%s):" % (count, description))
print("** expected:")
print(expected_result)
print("** received:")
print(result)
filename = "test.txt"

34
Lib/doctest.py
View file

@ -855,7 +855,7 @@ def _find(self, tests, obj, name, module, source_lines, globs, seen):
add them to `tests`.
"""
if self._verbose:
print 'Finding tests in %s' % name
print('Finding tests in %s' % name)
# If we've already processed this object, then ignore it.
if id(obj) in seen:
@ -1384,28 +1384,28 @@ def summarize(self, verbose=None):
failed.append(x)
if verbose:
if notests:
print len(notests), "items had no tests:"
print(len(notests), "items had no tests:")
notests.sort()
for thing in notests:
print " ", thing
print(" ", thing)
if passed:
print len(passed), "items passed all tests:"
print(len(passed), "items passed all tests:")
passed.sort()
for thing, count in passed:
print " %3d tests in %s" % (count, thing)
print(" %3d tests in %s" % (count, thing))
if failed:
print self.DIVIDER
print len(failed), "items had failures:"
print(self.DIVIDER)
print(len(failed), "items had failures:")
failed.sort()
for thing, (f, t) in failed:
print " %3d of %3d in %s" % (f, t, thing)
print(" %3d of %3d in %s" % (f, t, thing))
if verbose:
print totalt, "tests in", len(self._name2ft), "items."
print totalt - totalf, "passed and", totalf, "failed."
print(totalt, "tests in", len(self._name2ft), "items.")
print(totalt - totalf, "passed and", totalf, "failed.")
if totalf:
print "***Test Failed***", totalf, "failures."
print("***Test Failed***", totalf, "failures.")
elif verbose:
print "Test passed."
print("Test passed.")
return totalf, totalt
#/////////////////////////////////////////////////////////////////
@ -1415,8 +1415,8 @@ def merge(self, other):
d = self._name2ft
for name, (f, t) in other._name2ft.items():
if name in d:
print "*** DocTestRunner.merge: '" + name + "' in both" \
" testers; summing outcomes."
print("*** DocTestRunner.merge: '" + name + "' in both" \
" testers; summing outcomes.")
f2, t2 = d[name]
f = f + f2
t = t + t2
@ -1985,10 +1985,10 @@ def __init__(self, mod=None, globs=None, verbose=None, optionflags=0):
def runstring(self, s, name):
test = DocTestParser().get_doctest(s, self.globs, name, None, None)
if self.verbose:
print "Running string", name
print("Running string", name)
(f,t) = self.testrunner.run(test)
if self.verbose:
print f, "of", t, "examples failed in string", name
print(f, "of", t, "examples failed in string", name)
return (f,t)
def rundoc(self, object, name=None, module=None):
@ -2512,7 +2512,7 @@ def debug_script(src, pm=False, globs=None):
try:
execfile(srcfilename, globs, globs)
except:
print sys.exc_info()[1]
print(sys.exc_info()[1])
pdb.post_mortem(sys.exc_info()[2])
else:
# Note that %r is vital here. '%s' instead can, e.g., cause

30
Lib/email/generator.py
View file

@ -80,7 +80,7 @@ def flatten(self, msg, unixfrom=False):
ufrom = msg.get_unixfrom()
if not ufrom:
ufrom = 'From nobody ' + time.ctime(time.time())
print >> self._fp, ufrom
print(ufrom, file=self._fp)
self._write(msg)
def clone(self, fp):
@ -140,13 +140,13 @@ def _dispatch(self, msg):
def _write_headers(self, msg):
for h, v in msg.items():
print >> self._fp, '%s:' % h,
print('%s:' % h, end=' ', file=self._fp)
if self._maxheaderlen == 0:
# Explicit no-wrapping
print >> self._fp, v
print(v, file=self._fp)
elif isinstance(v, Header):
# Header instances know what to do
print >> self._fp, v.encode()
print(v.encode(), file=self._fp)
elif _is8bitstring(v):
# If we have raw 8bit data in a byte string, we have no idea
# what the encoding is. There is no safe way to split this
@ -154,14 +154,14 @@ def _write_headers(self, msg):
# ascii split, but if it's multibyte then we could break the
# string. There's no way to know so the least harm seems to
# be to not split the string and risk it being too long.
print >> self._fp, v
print(v, file=self._fp)
else:
# Header's got lots of smarts, so use it.
print >> self._fp, Header(
print(Header(
v, maxlinelen=self._maxheaderlen,
header_name=h, continuation_ws='\t').encode()
header_name=h, continuation_ws='\t').encode(), file=self._fp)
# A blank line always separates headers from body
print >> self._fp
print(file=self._fp)
#
# Handlers for writing types and subtypes
@ -215,9 +215,9 @@ def _handle_multipart(self, msg):
msg.set_boundary(boundary)
# If there's a preamble, write it out, with a trailing CRLF
if msg.preamble is not None:
print >> self._fp, msg.preamble
print(msg.preamble, file=self._fp)
# dash-boundary transport-padding CRLF
print >> self._fp, '--' + boundary
print('--' + boundary, file=self._fp)
# body-part
if msgtexts:
self._fp.write(msgtexts.pop(0))
@ -226,13 +226,13 @@ def _handle_multipart(self, msg):
# --> CRLF body-part
for body_part in msgtexts:
# delimiter transport-padding CRLF
print >> self._fp, '\n--' + boundary
print('\n--' + boundary, file=self._fp)
# body-part
self._fp.write(body_part)
# close-delimiter transport-padding
self._fp.write('\n--' + boundary + '--')
if msg.epilogue is not None:
print >> self._fp
print(file=self._fp)
self._fp.write(msg.epilogue)
def _handle_message_delivery_status(self, msg):
@ -308,12 +308,12 @@ def _dispatch(self, msg):
for part in msg.walk():
maintype = part.get_content_maintype()
if maintype == 'text':
print >> self, part.get_payload(decode=True)
print(part.get_payload(decode=True), file=self)
elif maintype == 'multipart':
# Just skip this
pass
else:
print >> self, self._fmt % {
print(self._fmt % {
'type' : part.get_content_type(),
'maintype' : part.get_content_maintype(),
'subtype' : part.get_content_subtype(),
@ -322,7 +322,7 @@ def _dispatch(self, msg):
'[no description]'),
'encoding' : part.get('Content-Transfer-Encoding',
'[no encoding]'),
}
}, file=self)

6
Lib/email/iterators.py
View file

@ -63,11 +63,11 @@ def _structure(msg, fp=None, level=0, include_default=False):
if fp is None:
fp = sys.stdout
tab = ' ' * (level * 4)
print >> fp, tab + msg.get_content_type(),
print(tab + msg.get_content_type(), end=' ', file=fp)
if include_default:
print >> fp, '[%s]' % msg.get_default_type()
print('[%s]' % msg.get_default_type(), file=fp)
else:
print >> fp
print(file=fp)
if msg.is_multipart():
for subpart in msg.get_payload():
_structure(subpart, fp, level+1, include_default)

2
Lib/email/test/test_email.py
View file

@ -56,7 +56,7 @@ def ndiffAssertEqual(self, first, second):
ssecond = str(second)
diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
fp = StringIO()
print >> fp, NL, NL.join(diff)
print(NL, NL.join(diff), file=fp)
raise self.failureException, fp.getvalue()
def _msgobj(self, filename):

2
Lib/email/test/test_email_renamed.py
View file

@ -57,7 +57,7 @@ def ndiffAssertEqual(self, first, second):
ssecond = str(second)
diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
fp = StringIO()
print >> fp, NL, NL.join(diff)
print(NL, NL.join(diff), file=fp)
raise self.failureException, fp.getvalue()
def _msgobj(self, filename):

20
Lib/filecmp.py
View file

@ -192,39 +192,39 @@ def phase4_closure(self): # Recursively call phase4() on subdirectories
def report(self): # Print a report on the differences between a and b
# Output format is purposely lousy
print 'diff', self.left, self.right
print('diff', self.left, self.right)
if self.left_only:
self.left_only.sort()
print 'Only in', self.left, ':', self.left_only
print('Only in', self.left, ':', self.left_only)
if self.right_only:
self.right_only.sort()
print 'Only in', self.right, ':', self.right_only
print('Only in', self.right, ':', self.right_only)
if self.same_files:
self.same_files.sort()
print 'Identical files :', self.same_files
print('Identical files :', self.same_files)
if self.diff_files:
self.diff_files.sort()
print 'Differing files :', self.diff_files
print('Differing files :', self.diff_files)
if self.funny_files:
self.funny_files.sort()
print 'Trouble with common files :', self.funny_files
print('Trouble with common files :', self.funny_files)
if self.common_dirs:
self.common_dirs.sort()
print 'Common subdirectories :', self.common_dirs
print('Common subdirectories :', self.common_dirs)
if self.common_funny:
self.common_funny.sort()
print 'Common funny cases :', self.common_funny
print('Common funny cases :', self.common_funny)
def report_partial_closure(self): # Print reports on self and on subdirs
self.report()
for sd in self.subdirs.itervalues():
print
print()
sd.report()
def report_full_closure(self): # Report on self and subdirs recursively
self.report()
for sd in self.subdirs.itervalues():
print
print()
sd.report_full_closure()
methodmap = dict(subdirs=phase4,

6
Lib/fileinput.py
View file

@ -405,9 +405,9 @@ def _test():
for line in input(args, inplace=inplace, backup=backup):
if line[-1:] == '\n': line = line[:-1]
if line[-1:] == '\r': line = line[:-1]
print "%d: %s[%d]%s %s" % (lineno(), filename(), filelineno(),
isfirstline() and "*" or "", line)
print "%d: %s[%d]" % (lineno(), filename(), filelineno())
print("%d: %s[%d]%s %s" % (lineno(), filename(), filelineno(),
isfirstline() and "*" or "", line))
print("%d: %s[%d]" % (lineno(), filename(), filelineno()))
if __name__ == '__main__':
_test()

22
Lib/formatter.py
View file

@ -323,37 +323,37 @@ class AbstractWriter(NullWriter):
"""
def new_alignment(self, align):
print "new_alignment(%r)" % (align,)
print("new_alignment(%r)" % (align,))
def new_font(self, font):
print "new_font(%r)" % (font,)
print("new_font(%r)" % (font,))
def new_margin(self, margin, level):
print "new_margin(%r, %d)" % (margin, level)
print("new_margin(%r, %d)" % (margin, level))
def new_spacing(self, spacing):
print "new_spacing(%r)" % (spacing,)
print("new_spacing(%r)" % (spacing,))
def new_styles(self, styles):
print "new_styles(%r)" % (styles,)
print("new_styles(%r)" % (styles,))
def send_paragraph(self, blankline):
print "send_paragraph(%r)" % (blankline,)
print("send_paragraph(%r)" % (blankline,))
def send_line_break(self):
print "send_line_break()"
print("send_line_break()")
def send_hor_rule(self, *args, **kw):
print "send_hor_rule()"
print("send_hor_rule()")
def send_label_data(self, data):
print "send_label_data(%r)" % (data,)
print("send_label_data(%r)" % (data,))
def send_flowing_data(self, data):
print "send_flowing_data(%r)" % (data,)
print("send_flowing_data(%r)" % (data,))
def send_literal_data(self, data):
print "send_literal_data(%r)" % (data,)
print("send_literal_data(%r)" % (data,))
class DumbWriter(NullWriter):

2
Lib/fpformat.py
View file

@ -137,6 +137,6 @@ def test():
try:
while 1:
x, digs = input('Enter (x, digs): ')
print x, fix(x, digs), sci(x, digs)
print(x, fix(x, digs), sci(x, digs))
except (EOFError, KeyboardInterrupt):
pass

18
Lib/ftplib.py
View file

@ -137,7 +137,7 @@ def getwelcome(self):
'''Get the welcome message from the server.
(this is read and squirreled away by connect())'''
if self.debugging:
print '*welcome*', self.sanitize(self.welcome)
print('*welcome*', self.sanitize(self.welcome))
return self.welcome
def set_debuglevel(self, level):
@ -167,12 +167,12 @@ def sanitize(self, s):
# Internal: send one line to the server, appending CRLF
def putline(self, line):
line = line + CRLF
if self.debugging > 1: print '*put*', self.sanitize(line)
if self.debugging > 1: print('*put*', self.sanitize(line))
self.sock.sendall(line)
# Internal: send one command to the server (through putline())
def putcmd(self, line):
if self.debugging: print '*cmd*', self.sanitize(line)
if self.debugging: print('*cmd*', self.sanitize(line))
self.putline(line)
# Internal: return one line from the server, stripping CRLF.
@ -180,7 +180,7 @@ def putcmd(self, line):
def getline(self):
line = self.file.readline()
if self.debugging > 1:
print '*get*', self.sanitize(line)
print('*get*', self.sanitize(line))
if not line: raise EOFError
if line[-2:] == CRLF: line = line[:-2]
elif line[-1:] in CRLF: line = line[:-1]
@ -206,7 +206,7 @@ def getmultiline(self):
# Raise various errors if the response indicates an error
def getresp(self):
resp = self.getmultiline()
if self.debugging: print '*resp*', self.sanitize(resp)
if self.debugging: print('*resp*', self.sanitize(resp))
self.lastresp = resp[:3]
c = resp[:1]
if c in ('1', '2', '3'):
@ -230,7 +230,7 @@ def abort(self):
IP and Synch; that doesn't seem to work with the servers I've
tried. Instead, just send the ABOR command as OOB data.'''
line = 'ABOR' + CRLF
if self.debugging > 1: print '*put urgent*', self.sanitize(line)
if self.debugging > 1: print('*put urgent*', self.sanitize(line))
self.sock.sendall(line, MSG_OOB)
resp = self.getmultiline()
if resp[:3] not in ('426', '226'):
@ -409,7 +409,7 @@ def retrlines(self, cmd, callback = None):
fp = conn.makefile('rb')
while 1:
line = fp.readline()
if self.debugging > 2: print '*retr*', repr(line)
if self.debugging > 2: print('*retr*', repr(line))
if not line:
break
if line[-2:] == CRLF:
@ -636,7 +636,7 @@ def parse257(resp):
def print_line(line):
'''Default retrlines callback to print a line.'''
print line
print(line)
def ftpcp(source, sourcename, target, targetname = '', type = 'I'):
@ -775,7 +775,7 @@ def test():
'''
if len(sys.argv) < 2:
print test.__doc__
print(test.__doc__)
sys.exit(0)
debugging = 0

2
Lib/getopt.py
View file

@ -208,4 +208,4 @@ def short_has_arg(opt, shortopts):
if __name__ == '__main__':
import sys
print getopt(sys.argv[1:], "a:b", ["alpha=", "beta"])
print(getopt(sys.argv[1:], "a:b", ["alpha=", "beta"]))

2
Lib/getpass.py
View file

@ -67,7 +67,7 @@ def win_getpass(prompt='Password: ', stream=None):
def default_getpass(prompt='Password: ', stream=None):
print >>sys.stderr, "Warning: Problem with getpass. Passwords may be echoed."
print("Warning: Problem with getpass. Passwords may be echoed.", file=sys.stderr)
return _raw_input(prompt, stream)

18
Lib/gopherlib.py
View file

@ -103,7 +103,7 @@ def get_directory(f):
while 1:
line = f.readline()
if not line:
print '(Unexpected EOF from server)'
print('(Unexpected EOF from server)')
break
if line[-2:] == CRLF:
line = line[:-2]
@ -112,17 +112,17 @@ def get_directory(f):
if line == '.':
break
if not line:
print '(Empty line from server)'
print('(Empty line from server)')
continue
gtype = line[0]
parts = line[1:].split(TAB)
if len(parts) < 4:
print '(Bad line from server: %r)' % (line,)
print('(Bad line from server: %r)' % (line,))
continue
if len(parts) > 4:
if parts[4:] != ['+']:
print '(Extra info from server:',
print parts[4:], ')'
print('(Extra info from server:', end=' ')
print(parts[4:], ')')
else:
parts.append('')
parts.insert(0, gtype)
@ -140,7 +140,7 @@ def get_alt_textfile(f, func):
while 1:
line = f.readline()
if not line:
print '(Unexpected EOF from server)'
print('(Unexpected EOF from server)')
break
if line[-2:] == CRLF:
line = line[:-2]
@ -196,13 +196,13 @@ def test():
f = send_selector(selector, host)
if type == A_TEXT:
lines = get_textfile(f)
for item in lines: print item
for item in lines: print(item)
elif type in (A_MENU, A_INDEX):
entries = get_directory(f)
for item in entries: print item
for item in entries: print(item)
else:
data = get_binary(f)
print 'binary data:', len(data), 'bytes:', repr(data[:100])[:40]
print('binary data:', len(data), 'bytes:', repr(data[:100])[:40])
# Run the test when run as script
if __name__ == '__main__':

2
Lib/gzip.py
View file

@ -470,7 +470,7 @@ def _test():
g = sys.stdout
else:
if arg[-3:] != ".gz":
print "filename doesn't end in .gz:", repr(arg)
print("filename doesn't end in .gz:", repr(arg))
continue
f = open(arg, "rb")
g = __builtin__.open(arg[:-3], "wb")

2
Lib/heapq.py
View file

@ -340,4 +340,4 @@ def nlargest(n, iterable, key=None):
sort = []
while heap:
sort.append(heappop(heap))
print sort
print(sort)

2
Lib/hotshot/log.py
View file

@ -159,7 +159,7 @@ def _loadfile(self, fileno):
try:
filename = self._filemap[fileno]
except KeyError:
print "Could not identify fileId", fileno
print("Could not identify fileId", fileno)
return 1
if filename is None:
return 1

6
Lib/hotshot/stones.py
View file

@ -10,9 +10,9 @@ def main(logfile):
benchtime, stones = p.runcall(test.pystone.pystones)
p.close()
print "Pystone(%s) time for %d passes = %g" % \
(test.pystone.__version__, test.pystone.LOOPS, benchtime)
print "This machine benchmarks at %g pystones/second" % stones
print("Pystone(%s) time for %d passes = %g" % \
(test.pystone.__version__, test.pystone.LOOPS, benchtime))
print("This machine benchmarks at %g pystones/second" % stones)
stats = hotshot.stats.load(logfile)
stats.strip_dirs()

2
Lib/htmllib.py
View file

@ -464,7 +464,7 @@ def test(args = None):
try:
f = open(file, 'r')
except IOError as msg:
print file, ":", msg
print(file, ":", msg)
sys.exit(1)
data = f.read()

42
Lib/httplib.py
View file

@ -342,7 +342,7 @@ def _read_status(self):
# Initialize with Simple-Response defaults
line = self.fp.readline()
if self.debuglevel > 0:
print "reply:", repr(line)
print("reply:", repr(line))
if not line:
# Presumably, the server closed the connection before
# sending a valid response.
@ -391,7 +391,7 @@ def begin(self):
if not skip:
break
if self.debuglevel > 0:
print "header:", skip
print("header:", skip)
self.status = status
self.reason = reason.strip()
@ -414,7 +414,7 @@ def begin(self):
self.msg = HTTPMessage(self.fp, 0)
if self.debuglevel > 0:
for hdr in self.msg.headers:
print "header:", hdr,
print("header:", hdr, end=' ')
# don't let the msg keep an fp
self.msg.fp = None
@ -665,11 +665,11 @@ def connect(self):
try:
self.sock = socket.socket(af, socktype, proto)
if self.debuglevel > 0:
print "connect: (%s, %s)" % (self.host, self.port)
print("connect: (%s, %s)" % (self.host, self.port))
self.sock.connect(sa)
except socket.error as msg:
if self.debuglevel > 0:
print 'connect fail:', (self.host, self.port)
print('connect fail:', (self.host, self.port))
if self.sock:
self.sock.close()
self.sock = None
@ -702,11 +702,11 @@ def send(self, str):
# NOTE: we DO propagate the error, though, because we cannot simply
# ignore the error... the caller will know if they can retry.
if self.debuglevel > 0:
print "send:", repr(str)
print("send:", repr(str))
try:
blocksize=8192
if hasattr(str,'read') :
if self.debuglevel > 0: print "sendIng a read()able"
if self.debuglevel > 0: print("sendIng a read()able")
data=str.read(blocksize)
while data:
self.sock.sendall(data)
@ -898,7 +898,7 @@ def _send_request(self, method, url, body, headers):
thelen = str(os.fstat(body.fileno()).st_size)
except (AttributeError, OSError):
# Don't send a length if this failed
if self.debuglevel > 0: print "Cannot stat!!"
if self.debuglevel > 0: print("Cannot stat!!")
if thelen is not None:
self.putheader('Content-Length',thelen)
@ -1408,13 +1408,13 @@ def test():
h.putrequest('GET', selector)
h.endheaders()
status, reason, headers = h.getreply()
print 'status =', status
print 'reason =', reason
print "read", len(h.getfile().read())
print
print('status =', status)
print('reason =', reason)
print("read", len(h.getfile().read()))
print()
if headers:
for header in headers.headers: print header.strip()
print
for header in headers.headers: print(header.strip())
print()
# minimal test that code to extract host from url works
class HTTP11(HTTP):
@ -1431,20 +1431,20 @@ class HTTP11(HTTP):
for host, selector in (('sourceforge.net', '/projects/python'),
):
print "https://%s%s" % (host, selector)
print("https://%s%s" % (host, selector))
hs = HTTPS()
hs.set_debuglevel(dl)
hs.connect(host)
hs.putrequest('GET', selector)
hs.endheaders()
status, reason, headers = hs.getreply()
print 'status =', status
print 'reason =', reason
print "read", len(hs.getfile().read())
print
print('status =', status)
print('reason =', reason)
print("read", len(hs.getfile().read()))
print()
if headers:
for header in headers.headers: print header.strip()
print
for header in headers.headers: print(header.strip())
print()
if __name__ == '__main__':
test()

6
Lib/idlelib/CallTips.py
View file

@ -201,9 +201,9 @@ def test(tests):
arg_text = ct.fetch_tip(name)
if arg_text != expected:
failed.append(t)
print "%s - expected %s, but got %s" % (t, expected,
get_arg_text(entity))
print "%d of %d tests failed" % (len(failed), len(tests))
print("%s - expected %s, but got %s" % (t, expected,
get_arg_text(entity)))
print("%d of %d tests failed" % (len(failed), len(tests)))
tc = TC()
tests = (t1, t2, t3, t4, t5, t6,

32
Lib/idlelib/ColorDelegator.py
View file

@ -72,7 +72,7 @@ def LoadTagDefs(self):
"hit": idleConf.GetHighlight(theme, "hit"),
}
if DEBUG: print 'tagdefs',self.tagdefs
if DEBUG: print('tagdefs',self.tagdefs)
def insert(self, index, chars, tags=None):
index = self.index(index)
@ -91,13 +91,13 @@ def delete(self, index1, index2=None):
def notify_range(self, index1, index2=None):
self.tag_add("TODO", index1, index2)
if self.after_id:
if DEBUG: print "colorizing already scheduled"
if DEBUG: print("colorizing already scheduled")
return
if self.colorizing:
self.stop_colorizing = True
if DEBUG: print "stop colorizing"
if DEBUG: print("stop colorizing")
if self.allow_colorizing:
if DEBUG: print "schedule colorizing"
if DEBUG: print("schedule colorizing")
self.after_id = self.after(1, self.recolorize)
close_when_done = None # Window to be closed when done colorizing
@ -106,7 +106,7 @@ def close(self, close_when_done=None):
if self.after_id:
after_id = self.after_id
self.after_id = None
if DEBUG: print "cancel scheduled recolorizer"
if DEBUG: print("cancel scheduled recolorizer")
self.after_cancel(after_id)
self.allow_colorizing = False
self.stop_colorizing = True
@ -120,42 +120,42 @@ def toggle_colorize_event(self, event):
if self.after_id:
after_id = self.after_id
self.after_id = None
if DEBUG: print "cancel scheduled recolorizer"
if DEBUG: print("cancel scheduled recolorizer")
self.after_cancel(after_id)
if self.allow_colorizing and self.colorizing:
if DEBUG: print "stop colorizing"
if DEBUG: print("stop colorizing")
self.stop_colorizing = True
self.allow_colorizing = not self.allow_colorizing
if self.allow_colorizing and not self.colorizing:
self.after_id = self.after(1, self.recolorize)
if DEBUG:
print "auto colorizing turned",\
self.allow_colorizing and "on" or "off"
print("auto colorizing turned",\
self.allow_colorizing and "on" or "off")
return "break"
def recolorize(self):
self.after_id = None
if not self.delegate:
if DEBUG: print "no delegate"
if DEBUG: print("no delegate")
return
if not self.allow_colorizing:
if DEBUG: print "auto colorizing is off"
if DEBUG: print("auto colorizing is off")
return
if self.colorizing:
if DEBUG: print "already colorizing"
if DEBUG: print("already colorizing")
return
try:
self.stop_colorizing = False
self.colorizing = True
if DEBUG: print "colorizing..."
if DEBUG: print("colorizing...")
t0 = time.clock()
self.recolorize_main()
t1 = time.clock()
if DEBUG: print "%.3f seconds" % (t1-t0)
if DEBUG: print("%.3f seconds" % (t1-t0))
finally:
self.colorizing = False
if self.allow_colorizing and self.tag_nextrange("TODO", "1.0"):
if DEBUG: print "reschedule colorizing"
if DEBUG: print("reschedule colorizing")
self.after_id = self.after(1, self.recolorize)
if self.close_when_done:
top = self.close_when_done
@ -240,7 +240,7 @@ def recolorize_main(self):
self.tag_add("TODO", next)
self.update()
if self.stop_colorizing:
if DEBUG: print "colorizing stopped"
if DEBUG: print("colorizing stopped")
return
def removecolors(self):

2
Lib/idlelib/Delegator.py
View file

@ -23,7 +23,7 @@ def resetcache(self):
def cachereport(self):
keys = self.__cache.keys()
keys.sort()
print keys
print(keys)
def setdelegate(self, delegate):
self.resetcache()

4
Lib/idlelib/EditorWindow.py
View file

@ -859,7 +859,7 @@ def load_standard_extensions(self):
try:
self.load_extension(name)
except:
print "Failed to load extension", repr(name)
print("Failed to load extension", repr(name))
import traceback
traceback.print_exc()
@ -870,7 +870,7 @@ def load_extension(self, name):
try:
mod = __import__(name, globals(), locals(), [])
except ImportError:
print "\nFailed to import extension: ", name
print("\nFailed to import extension: ", name)
return
cls = getattr(mod, name)
keydefs = idleConf.GetExtensionBindings(name)

4
Lib/idlelib/FileList.py
View file

@ -54,7 +54,7 @@ def close_edit(self, edit):
try:
key = self.inversedict[edit]
except KeyError:
print "Don't know this EditorWindow object. (close)"
print("Don't know this EditorWindow object. (close)")
return
if key:
del self.dict[key]
@ -67,7 +67,7 @@ def filename_changed_edit(self, edit):
try:
key = self.inversedict[edit]
except KeyError:
print "Don't know this EditorWindow object. (rename)"
print("Don't know this EditorWindow object. (rename)")
return
filename = edit.io.filename
if not filename:

12
Lib/idlelib/GrepDialog.py
View file

@ -77,13 +77,13 @@ def grep_it(self, prog, path):
list.sort()
self.close()
pat = self.engine.getpat()
print "Searching %r in %s ..." % (pat, path)
print("Searching %r in %s ..." % (pat, path))
hits = 0
for fn in list:
try:
f = open(fn)
except IOError as msg:
print msg
print(msg)
continue
lineno = 0
while 1:
@ -102,16 +102,16 @@ def grep_it(self, prog, path):
s = ""
else:
s = "s"
print "Found", hits, "hit%s." % s
print "(Hint: right-click to open locations.)"
print("Found", hits, "hit%s." % s)
print("(Hint: right-click to open locations.)")
else:
print "No hits."
print("No hits.")
def findfiles(self, dir, base, rec):
try:
names = os.listdir(dir or os.curdir)
except os.error as msg:
print msg
print(msg)
return []
list = []
subdirs = []

2
Lib/idlelib/MultiCall.py
View file

@ -388,7 +388,7 @@ def __del__(self):
text.pack()
def bindseq(seq, n=[0]):
def handler(event):
print seq
print(seq)
text.bind("<<handler%d>>"%n[0], handler)
text.event_add("<<handler%d>>"%n[0], seq)
n[0] += 1

4
Lib/idlelib/Percolator.py
View file

@ -58,10 +58,10 @@ def __init__(self, name):
self.name = name
Delegator.__init__(self, None)
def insert(self, *args):
print self.name, ": insert", args
print(self.name, ": insert", args)
self.delegate.insert(*args)
def delete(self, *args):
print self.name, ": delete", args
print(self.name, ": delete", args)
self.delegate.delete(*args)
root = Tk()
root.wm_protocol("WM_DELETE_WINDOW", root.quit)

19
Lib/idlelib/PyShell.py
View file

@ -19,8 +19,8 @@
try:
from Tkinter import *
except ImportError:
print>>sys.__stderr__, "** IDLE can't import Tkinter. " \
"Your Python may not be configured for Tk. **"
print("** IDLE can't import Tkinter. " \
"Your Python may not be configured for Tk. **", file=sys.__stderr__)
sys.exit(1)
import tkMessageBox
@ -504,14 +504,14 @@ def poll_subprocess(self):
console = self.tkconsole.console
if how == "OK":
if what is not None:
print >>console, repr(what)
print(repr(what), file=console)
elif how == "EXCEPTION":
if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"):
self.remote_stack_viewer()
elif how == "ERROR":
errmsg = "PyShell.ModifiedInterpreter: Subprocess ERROR:\n"
print >>sys.__stderr__, errmsg, what
print >>console, errmsg, what
print(errmsg, what, file=sys.__stderr__)
print(errmsg, what, file=console)
# we received a response to the currently active seq number:
try:
self.tkconsole.endexecuting()
@ -576,8 +576,8 @@ def execfile(self, filename, source=None):
except (OverflowError, SyntaxError):
self.tkconsole.resetoutput()
tkerr = self.tkconsole.stderr
print>>tkerr, '*** Error in script or command!\n'
print>>tkerr, 'Traceback (most recent call last):'
print('*** Error in script or command!\n', file=tkerr)
print('Traceback (most recent call last):', file=tkerr)
InteractiveInterpreter.showsyntaxerror(self, filename)
self.tkconsole.showprompt()
else:
@ -730,8 +730,7 @@ def runcode(self, code):
if use_subprocess:
# When run w/o subprocess, both user and IDLE errors
# are printed here; skip message in that case.
print >> self.tkconsole.stderr, \
"IDLE internal error in runcode()"
print("IDLE internal error in runcode()", file=self.tkconsole.stderr)
self.showtraceback()
if use_subprocess:
self.tkconsole.endexecuting()
@ -1349,7 +1348,7 @@ def main():
if os.path.isfile(script):
pass
else:
print "No script file: ", script
print("No script file: ", script)
sys.exit()
enable_shell = True
if o == '-s':

4
Lib/idlelib/ScrolledList.py
View file

@ -124,8 +124,8 @@ def test():
root.protocol("WM_DELETE_WINDOW", root.destroy)
class MyScrolledList(ScrolledList):
def fill_menu(self): self.menu.add_command(label="pass")
def on_select(self, index): print "select", self.get(index)
def on_double(self, index): print "double", self.get(index)
def on_select(self, index): print("select", self.get(index))
def on_double(self, index): print("double", self.get(index))
s = MyScrolledList(root)
for i in range(30):
s.append("item %02d" % i)

8
Lib/idlelib/UndoDelegator.py
View file

@ -38,10 +38,10 @@ def setdelegate(self, delegate):
def dump_event(self, event):
from pprint import pprint
pprint(self.undolist[:self.pointer])
print "pointer:", self.pointer,
print "saved:", self.saved,
print "can_merge:", self.can_merge,
print "get_saved():", self.get_saved()
print("pointer:", self.pointer, end=' ')
print("saved:", self.saved, end=' ')
print("can_merge:", self.can_merge, end=' ')
print("get_saved():", self.get_saved())
pprint(self.undolist[self.pointer:])
return "break"

2
Lib/idlelib/WidgetRedirector.py
View file

@ -83,7 +83,7 @@ def main():
redir = WidgetRedirector(text)
global orig_insert
def my_insert(*args):
print "insert", args
print("insert", args)
orig_insert(*args)
orig_insert = redir.register("insert", my_insert)
root.mainloop()

2
Lib/idlelib/WindowList.py
View file

@ -46,7 +46,7 @@ def call_callbacks(self):
callback()
except:
t, v, tb = sys.exc_info()
print "warning: callback failed in WindowList", t, ":", v
print("warning: callback failed in WindowList", t, ":", v)
registry = WindowList()

14
Lib/idlelib/configHandler.py
View file

@ -679,18 +679,18 @@ def SaveUserCfgFiles(self):
### module test
if __name__ == '__main__':
def dumpCfg(cfg):
print '\n',cfg,'\n'
print('\n',cfg,'\n')
for key in cfg.keys():
sections=cfg[key].sections()
print key
print sections
print(key)
print(sections)
for section in sections:
options=cfg[key].options(section)
print section
print options
print(section)
print(options)
for option in options:
print option, '=', cfg[key].Get(section,option)
print(option, '=', cfg[key].Get(section,option))
dumpCfg(idleConf.defaultCfg)
dumpCfg(idleConf.userCfg)
print idleConf.userCfg['main'].Get('Theme','name')
print(idleConf.userCfg['main'].Get('Theme','name'))
#print idleConf.userCfg['highlight'].GetDefHighlight('Foo','normal')

Some files were not shown because too many files have changed in this diff Show more