Changeset 6582b36 in mainline for tools/xstruct.py

Timestamp:

2012-04-01T07:13:03Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

81475250

Parents:

d9faae91

Message:

Make some scripts work with Python 3.

Arch Linux has already switched so "python" means version 3, so these
scripts don't run otherwise. Only the simplest fixes are made. Note that
automatic int-to-long conversion has existed since at least Python 2.4.

File:

• tools/xstruct.py (modified) (1 diff)

tools/xstruct.py

@@ -32 +32 @@
 
 import struct
+import sys
 import types
 
+integer_types = (int, long) if sys.version < '3' else (int,)
+
 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),
 }