Changeset 432f68a in mainline for tools/mkfat.py

Timestamp:

2011-03-21T15:29:05Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5287502, 5e3eea10, 667a4f8, ab10b842, f554a94

Parents:

afe1d1e

git-author:

Vojtech Horky <> (2011-03-21 15:29:05)

git-committer:

Martin Decky <martin@…> (2011-03-21 15:29:05)

Message:

improve compatibility with Python 3.2 (thx Vojtech Horky)

File:

• tools/mkfat.py (modified) (3 diffs)

tools/mkfat.py

@@ -211 +211 @@
         dir_entry = xstruct.create(DIR_ENTRY)
         
-        dir_entry.name = mangle_fname(name)
-        dir_entry.ext = mangle_ext(name)
+        dir_entry.name = mangle_fname(name).encode('ascii')
+        dir_entry.ext = mangle_ext(name).encode('ascii')
         
         if (directory):
@@ -239 +239 @@
         
         dir_entry.signature = 0x2e
-        dir_entry.name = '       '
-        dir_entry.ext = '   '
+        dir_entry.name = b'       '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10
         
@@ -258 +258 @@
         
         dir_entry.signature = [0x2e, 0x2e]
-        dir_entry.name = '      '
-        dir_entry.ext = '   '
+        dir_entry.name = b'      '
+        dir_entry.ext = b'   '
         dir_entry.attr = 0x10