summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-09-25 21:38:29 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-09-25 21:38:29 (GMT)
commit6e52a5a8376579cc195ba411f2f3e556286fb0f2 (patch)
tree5a78cd049207dfe76916798dad3b83c78462fa78
parent0e33da095f39ad18791cb4457dca868a74d84e72 (diff)
downloadcpython-6e52a5a8376579cc195ba411f2f3e556286fb0f2.zip
cpython-6e52a5a8376579cc195ba411f2f3e556286fb0f2.tar.gz
cpython-6e52a5a8376579cc195ba411f2f3e556286fb0f2.tar.bz2
Merged revisions 75064 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75064 | ezio.melotti | 2009-09-26 00:35:24 +0300 (Sat, 26 Sep 2009) | 1 line fix print statement ........
-rw-r--r--Lib/ctypes/test/__init__.py2
-rwxr-xr-xLib/smtplib.py4
-rw-r--r--Lib/zipfile.py29
3 files changed, 17 insertions, 18 deletions
diff --git a/Lib/ctypes/test/__init__.py b/Lib/ctypes/test/__init__.py
index 1e0460a..82dc9e3 100644
--- a/Lib/ctypes/test/__init__.py
+++ b/Lib/ctypes/test/__init__.py
@@ -58,7 +58,7 @@ def get_tests(package, mask, verbosity, exclude=()):
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(), ['*'])
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index b88adfe..a01a184 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -800,13 +800,13 @@ class LMTP(SMTP):
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)
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 8c4ffc5..6357b94 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1188,22 +1188,21 @@ class ZipFile:
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)