Changeset 67435b1 in mainline

Timestamp:

2012-05-22T10:31:25Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a58bc8b, df3f85f

Parents:

c4b0317

Message:

Make tools work with Python 3 again

Location:

tools

Files:

• mkfat.py (modified) (3 diffs)
• xstruct.py (modified) (2 diffs)

tools/mkfat.py

@@ -189 +189 @@
         "Filter FAT legal characters"
         
-        filtered_name = ''
+        filtered_name = b''
         filtered = False
         
@@ -205 +205 @@
         
         ascii_name, lfn = fat_lchars(name)
-        ascii_parts = ascii_name.split('.')
+        # Splitting works only on strings, not on bytes
+        ascii_parts = ascii_name.decode('utf8').split('.')
         
         short_name = ''
@@ -444 +445 @@
         extra_bytes = int(sys.argv[1])
         
-        path = os.path.abspath(sys.argv[2].decode())
+        path = os.path.abspath(sys.argv[2])
         if (not os.path.isdir(path)):
                 print("<PATH> must be a directory")

tools/xstruct.py

@@ -35 +35 @@
 import types
 
+# Handle long integer conversions nicely in both Python 2 and Python 3
 integer_types = (int, long) if sys.version < '3' else (int,)
+
+# Ensure that 's' format for struct receives correct data type depending
+# on Python version (needed due to different way to encode into bytes) 
+ensure_string = \
+        (lambda value: value if type(value) is str else bytes(value)) \
+                if sys.version < '3' else \
+        (lambda value: bytes(value, 'ascii') if type(value) is str else value)
 
 ranges = {
@@ -77 +85 @@
                                         args.append(item)
                         else:
+                                if (fmt == "s"):
+                                        value = ensure_string(value)
                                 check_range(variable, fmt, value)
                                 args.append(value)