[Python-checkins] r75064 - in python/branches/py3k/Lib: ctypes/test/__init__.py smtplib.py zipfile.py
ezio.melotti
python-checkins at python.org
Fri Sep 25 23:35:24 CEST 2009
Author: ezio.melotti
Date: Fri Sep 25 23:35:24 2009
New Revision: 75064
Log:
fix print statement
Modified:
python/branches/py3k/Lib/ctypes/test/__init__.py
python/branches/py3k/Lib/smtplib.py
python/branches/py3k/Lib/zipfile.py
Modified: python/branches/py3k/Lib/ctypes/test/__init__.py
==============================================================================
--- python/branches/py3k/Lib/ctypes/test/__init__.py (original)
+++ python/branches/py3k/Lib/ctypes/test/__init__.py Fri Sep 25 23:35:24 2009
@@ -58,7 +58,7 @@
if modname.split(".")[-1] in exclude:
skipped.append(modname)
if verbosity > 1:
- print >> sys.stderr, "Skipped %s: excluded" % modname
+ print("Skipped %s: excluded" % modname, file=sys.stderr)
continue
try:
mod = __import__(modname, globals(), locals(), ['*'])
Modified: python/branches/py3k/Lib/smtplib.py
==============================================================================
--- python/branches/py3k/Lib/smtplib.py (original)
+++ python/branches/py3k/Lib/smtplib.py Fri Sep 25 23:35:24 2009
@@ -800,13 +800,13 @@
self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.sock.connect(host)
except socket.error as msg:
- if self.debuglevel > 0: print>>stderr, 'connect fail:', host
+ if self.debuglevel > 0: print('connect fail:', host, file=stderr)
if self.sock:
self.sock.close()
self.sock = None
raise socket.error(msg)
(code, msg) = self.getreply()
- if self.debuglevel > 0: print>>stderr, "connect:", msg
+ if self.debuglevel > 0: print('connect:', msg, file=stderr)
return (code, msg)
Modified: python/branches/py3k/Lib/zipfile.py
==============================================================================
--- python/branches/py3k/Lib/zipfile.py (original)
+++ python/branches/py3k/Lib/zipfile.py Fri Sep 25 23:35:24 2009
@@ -1191,22 +1191,21 @@
try:
filename, flag_bits = zinfo._encodeFilenameFlags()
centdir = struct.pack(structCentralDir,
- stringCentralDir, create_version,
- zinfo.create_system, extract_version, zinfo.reserved,
- flag_bits, zinfo.compress_type, dostime, dosdate,
- zinfo.CRC, compress_size, file_size,
- len(filename), len(extra_data), len(zinfo.comment),
- 0, zinfo.internal_attr, zinfo.external_attr,
- header_offset)
+ stringCentralDir, create_version,
+ zinfo.create_system, extract_version, zinfo.reserved,
+ flag_bits, zinfo.compress_type, dostime, dosdate,
+ zinfo.CRC, compress_size, file_size,
+ len(filename), len(extra_data), len(zinfo.comment),
+ 0, zinfo.internal_attr, zinfo.external_attr,
+ header_offset)
except DeprecationWarning:
- print >>sys.stderr, (structCentralDir,
- stringCentralDir, create_version,
- zinfo.create_system, extract_version, zinfo.reserved,
- zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
- zinfo.CRC, compress_size, file_size,
- len(zinfo.filename), len(extra_data), len(zinfo.comment),
- 0, zinfo.internal_attr, zinfo.external_attr,
- header_offset)
+ print((structCentralDir, stringCentralDir, create_version,
+ zinfo.create_system, extract_version, zinfo.reserved,
+ zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+ zinfo.CRC, compress_size, file_size,
+ len(zinfo.filename), len(extra_data), len(zinfo.comment),
+ 0, zinfo.internal_attr, zinfo.external_attr,
+ header_offset), file=sys.stderr)
raise
self.fp.write(centdir)
self.fp.write(filename)
More information about the Python-checkins
mailing list