Changeset efedee77 in mainline for tools/pack.py

Timestamp:

2010-11-02T22:38:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• tools/pack.py (modified) (6 diffs)

tools/pack.py

@@ -43 +43 @@
 def usage(prname):
         "Print usage syntax"
-        print "%s <OBJCOPY> <FORMAT> <ARCH> <ARCH_PATH> [COMPONENTS ...]" % prname
+        print("%s <OBJCOPY> <FORMAT> <ARCH> <ARCH_PATH> [COMPONENTS ...]" % prname)
 
 def deflate(data):
@@ -110 +110 @@
                 symbol = "_binary_%s" % basename.replace(".", "_")
                 
-                print "%s -> %s" % (component, obj)
+                print("%s -> %s" % (component, obj))
                 
-                comp_in = file(component, "rb")
-                comp_data = comp_in.read();
+                comp_in = open(component, "rb")
+                comp_data = comp_in.read()
                 comp_in.close()
                 
@@ -121 +121 @@
                 
                 try:
-                        comp_out = file(basename, "wb")
+                        comp_out = open(basename, "wb")
                         comp_out.write(comp_deflate)
                         comp_out.close()
@@ -151 +151 @@
                 cnt += 1
         
-        header = file(os.path.join(arch_path, "include", "%s.h" % COMPONENTS), "w")
+        header = open(os.path.join(arch_path, "include", "%s.h" % COMPONENTS), "w")
         
         header.write('/***************************************\n')
@@ -173 +173 @@
         header.close()
         
-        data = file(os.path.join(arch_path, "src", "%s.c" % COMPONENTS), "w")
+        data = open(os.path.join(arch_path, "src", "%s.c" % COMPONENTS), "w")
         
         data.write('/***************************************\n')
@@ -187 +187 @@
         data.close()
         
-        link_in = file(os.path.join(arch_path, "%s.in" % LINK), "r")
+        link_in = open(os.path.join(arch_path, "%s.in" % LINK), "r")
         template = link_in.read()
         link_in.close()
         
-        link_out = file(os.path.join(arch_path, "%s.comp" % LINK), "w")
+        link_out = open(os.path.join(arch_path, "%s.comp" % LINK), "w")
         link_out.write(template.replace("[[COMPONENTS]]", "\n".join(link_ctx)))
         link_out.close()