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
........

diff --git a/Lib/ctypes/test/__init__.py b/Lib/ctypes/test/__init__.py
index 1e0460a891b75342a5a02edd0bff1d3229fcbfc7..82dc9e3e9e70a9fc37a122a81f85f7d6cd9a721c 100644 (file)
--- 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 b88adfe96e3f0ccc74da3aab47511dbf676a602d..a01a184c9f9c8eb723e188729ef9a08914c341cc 100755 (executable)
--- 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 8c4ffc57282b241886d98dfbd16b8554e5e32f12..6357b94d2b6d6b24503a455ed818ef3f5c7c61ae 100644 (file)
--- 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)