diff -r 8893fc8e885e Lib/ctypes/_endian.py --- a/Lib/ctypes/_endian.py Wed Jul 13 15:59:43 2011 +0200 +++ b/Lib/ctypes/_endian.py Wed Jul 13 09:37:59 2011 -0700 @@ -7,14 +7,18 @@ """Return the type with the 'other' byte order. Simple types like c_int and so on already have __ctype_be__ and __ctype_le__ attributes which contain the types, for more complicated types - only arrays are supported. + arrays and structures are supported. """ - try: + # check _OTHER_ENDIAN attribute (present if typ is primitive type) + if hasattr(typ, _OTHER_ENDIAN): return getattr(typ, _OTHER_ENDIAN) - except AttributeError: - if type(typ) == _array_type: - return _other_endian(typ._type_) * typ._length_ - raise TypeError("This type does not support other endian: %s" % typ) + # if typ is array + if type(typ) == _array_type: + return _other_endian(typ._type_) * typ._length_ + # if typ is structure + if issubclass(typ, Structure): + return typ + raise TypeError("This type does not support other endian: %s" % typ) class _swapped_meta(type(Structure)): def __setattr__(self, attrname, value): diff -r 8893fc8e885e Lib/ctypes/test/test_byteswap.py --- a/Lib/ctypes/test/test_byteswap.py Wed Jul 13 15:59:43 2011 +0200 +++ b/Lib/ctypes/test/test_byteswap.py Wed Jul 13 09:37:59 2011 -0700 @@ -185,18 +185,35 @@ self.assertRaises(TypeError, setattr, T, "_fields_", [("x", typ)]) def test_struct_struct(self): - # Nested structures with different byte order not (yet) supported - if sys.byteorder == "little": - base = BigEndianStructure - else: - base = LittleEndianStructure + # nested structures with different byteorders - class T(Structure): - _fields_ = [("a", c_int), - ("b", c_int)] - class S(base): - pass - self.assertRaises(TypeError, setattr, S, "_fields_", [("s", T)]) + # create nested structures with given byteorders and set memory to data + def set_structures(endianness, nested_endianness, data): + class NestedStructure(nested_endianness): + _fields_ = [("x", c_uint32), + ("y", c_uint32)] + + class TestStructure(endianness): + _fields_ = [("point", NestedStructure)] + + assert(len(data) == sizeof(TestStructure)) + return cast(data, POINTER(TestStructure))[0] + + s = set_structures(BigEndianStructure, BigEndianStructure, b'\0\0\0\1\0\0\0\2') + self.assertEqual(s.point.x, 1) + self.assertEqual(s.point.y, 2) + + s = set_structures(BigEndianStructure, LittleEndianStructure, b'\1\0\0\0\2\0\0\0') + self.assertEqual(s.point.x, 1) + self.assertEqual(s.point.y, 2) + + s = set_structures(LittleEndianStructure, BigEndianStructure, b'\0\0\0\1\0\0\0\2') + self.assertEqual(s.point.x, 1) + self.assertEqual(s.point.y, 2) + + s = set_structures(LittleEndianStructure, LittleEndianStructure, b'\1\0\0\0\2\0\0\0') + self.assertEqual(s.point.x, 1) + self.assertEqual(s.point.y, 2) def test_struct_fields_2(self): # standard packing in struct uses no alignment.