diff -r ab162f925761 Lib/ctypes/_endian.py --- a/Lib/ctypes/_endian.py Mon Jul 11 01:39:35 2011 +0200 +++ b/Lib/ctypes/_endian.py Mon Jul 11 19:27:20 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 ab162f925761 Lib/ctypes/test/test_byteswap.py --- a/Lib/ctypes/test/test_byteswap.py Mon Jul 11 01:39:35 2011 +0200 +++ b/Lib/ctypes/test/test_byteswap.py Mon Jul 11 19:27:20 2011 -0700 @@ -184,20 +184,6 @@ pass 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 - - class T(Structure): - _fields_ = [("a", c_int), - ("b", c_int)] - class S(base): - pass - self.assertRaises(TypeError, setattr, S, "_fields_", [("s", T)]) - def test_struct_fields_2(self): # standard packing in struct uses no alignment. # So, we have to align using pad bytes.