Changeset 4b16422 in mainline for tools/xstruct.py

Timestamp:

2012-05-30T20:36:37Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5c5c346a

Parents:

ce683ed3 (diff), 692be1ae (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/xstruct.py (modified) (2 diffs)

tools/xstruct.py

@@ -32 +32 @@
 
 import struct
+import sys
 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 = {
-        'B': ((int, long), 0x00, 0xff),
-        'H': ((int, long), 0x0000, 0xffff),
-        'L': ((int, long), 0x00000000, 0xffffffff),
-        'Q': ((int, long), 0x0000000000000000, 0xffffffffffffffff),
-        'b': ((int, long), -0x80, 0x7f),
-        'h': ((int, long), -0x8000, 0x7fff),
-        'l': ((int, long), -0x80000000, 0x7fffffff) ,
-        'q': ((int, long), -0x8000000000000000, 0x7fffffffffffffff),
+        'B': (integer_types, 0x00, 0xff),
+        'H': (integer_types, 0x0000, 0xffff),
+        'L': (integer_types, 0x00000000, 0xffffffff),
+        'Q': (integer_types, 0x0000000000000000, 0xffffffffffffffff),
+        'b': (integer_types, -0x80, 0x7f),
+        'h': (integer_types, -0x8000, 0x7fff),
+        'l': (integer_types, -0x80000000, 0x7fffffff) ,
+        'q': (integer_types, -0x8000000000000000, 0x7fffffffffffffff),
 }
 
@@ -74 +85 @@
                                         args.append(item)
                         else:
+                                if (fmt == "s"):
+                                        value = ensure_string(value)
                                 check_range(variable, fmt, value)
                                 args.append(value)