Port to Python 3.0.

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index a184973380d041600c6f2c712c6995a97f5d6435..f266fcc93e54b852739d072109241cbd63f78ed3 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -103,8 +103,9 @@ extensions = [
 msvcr71_uuid = "{8666C8DD-D0B4-4B42-928E-A69E32FA5D4D}"
 pythondll_uuid = {
     "24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
-    "25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}"
+    "25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}",
     "26":"{34ebecac-f046-4e1c-b0e3-9bac3cdaacfa}",
+    "30":"{6953bc3b-6768-4291-8410-7914ce6e2ca8}",
     } [major+minor]
 
 # Build the mingw import library, libpythonXY.a
@@ -124,14 +125,14 @@ def build_mingw_lib(lib_file, def_file, dll_file, mingw_lib):
     export_match = re.compile(r"^_imp__(.*) in python\d+\.dll").match
 
     f = open(def_file,'w')
-    print("LIBRARY %s" % dll_file, file=f)
-    print("EXPORTS", file=f)
+    f.write("LIBRARY %s\n" % dll_file)
+    f.write("EXPORTS\n")
 
     nm_pipe = os.popen(nm_command)
     for line in nm_pipe.readlines():
         m = export_match(line)
         if m:
-            print(m.group(1), file=f)
+            f.write(m.group(1)+"\n")
     f.close()
     exit = nm_pipe.close()
 

diff --git a/Tools/msi/msilib.py b/Tools/msi/msilib.py
index 9823e2ab9e4cecbbb5d6466ee8b98995531136b2..8a232bfdab6c95eddf8f0912d175573f5f1dcd1c 100644 (file)
--- a/Tools/msi/msilib.py
+++ b/Tools/msi/msilib.py
@@ -202,7 +202,7 @@ def gen_sequence(destpath, msipath):
     v = seqmsi.OpenView("SELECT * FROM _Tables");
     v.Execute(None)
     f = open(destpath, "w")
-    print("import msilib,os;dirname=os.path.dirname(__file__)", file=f)
+    f.write("import msilib,os;dirname=os.path.dirname(__file__)\n")
     tables = []
     while 1:
         r = v.Fetch()
@@ -364,9 +364,9 @@ class CAB:
             logical = self.gen_id(dir, file)
         self.index += 1
         if full.find(" ")!=-1:
-            print('"%s" %s' % (full, logical), file=self.file)
+            self.file.write('"%s" %s\n' % (full, logical))
         else:
-            print('%s %s' % (full, logical), file=self.file)
+            self.file.write('%s %s\n' % (full, logical))
         return self.index, logical
 
     def commit(self, db):
@@ -390,8 +390,8 @@ class CAB:
             cabarc = "cabarc.exe"
         cmd = r'"%s" -m lzx:21 n %s.cab @%s.txt' % (cabarc, self.name, self.name)
         p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
-                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)[0]
-        for line in (p.stdout, p.stdin):
+                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        for line in p.stdout:
             if line.startswith("  -- adding "):
                 sys.stdout.write(".")
             else: