Changeset 8fb1bf82 in mainline for tools/mkhord.py

Timestamp:

2010-11-25T13:42:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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/mkhord.py (modified) (2 diffs)

tools/mkhord.py

@@ -52 +52 @@
 def usage(prname):
         "Print usage syntax"
-        print prname + " <ALIGNMENT> <FS_IMAGE> <HORD_IMAGE>" 
+        print(prname + " <ALIGNMENT> <FS_IMAGE> <HORD_IMAGE>")
 
 def main():
@@ -60 +60 @@
         
         if (not sys.argv[1].isdigit()):
-                print "<ALIGNMENT> must be a number"
+                print("<ALIGNMENT> must be a number")
                 return
         
         align = int(sys.argv[1], 0)
         if (align <= 0):
-                print "<ALIGNMENT> must be positive"
+                print("<ALIGNMENT> must be positive")
                 return
         
         fs_image = os.path.abspath(sys.argv[2])
         if (not os.path.isfile(fs_image)):
-                print "<FS_IMAGE> must be a file"
+                print("<FS_IMAGE> must be a file")
                 return
         
-        inf = file(fs_image, "rb")
-        outf = file(sys.argv[3], "wb")
+        inf = open(fs_image, "rb")
+        outf = open(sys.argv[3], "wb")
         
         header = xstruct.create(HEADER)