Changeset 67435b1 in mainline for tools/xstruct.py

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

File:

• tools/xstruct.py (modified) (2 diffs)

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)