[Jython-checkins] SF.net SVN: jython:[6752] branches/ctypes-jffi/Lib/ctypes/__init__.py

[<wme...@us...>]

Revision: 6752
          http://jython.svn.sourceforge.net/jython/?rev=6752&view=rev
Author:   wmeissner
Date:     2009-09-05 01:28:02 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
Fix Union hierarchy

Modified Paths:
--------------
    branches/ctypes-jffi/Lib/ctypes/__init__.py

Modified: branches/ctypes-jffi/Lib/ctypes/__init__.py
===================================================================
--- branches/ctypes-jffi/Lib/ctypes/__init__.py	2009-09-04 14:41:21 UTC (rev 6751)
+++ branches/ctypes-jffi/Lib/ctypes/__init__.py	2009-09-05 01:28:02 UTC (rev 6752)
@@ -118,14 +118,14 @@
     def __new__(cls, name, bases, dict):
         return _AggregateMetaClass.__new_aggregate__(cls, name, bases, dict, union = False)
 
-class _UnionMetaClass(type):
+class _UnionMetaClass(_AggregateMetaClass):
     def __new__(cls, name, bases, dict):
         return _AggregateMetaClass.__new_aggregate__(cls, name, bases, dict, union = True)
 
 class Structure(jffi.Structure, _CData):
     __metaclass__ = _StructMetaClass
 
-class Union(jffi.Structure):
+class Union(jffi.Structure, _CData):
     __metaclass__ = _UnionMetaClass
 
 def sizeof(type):
@@ -165,7 +165,7 @@
     return ptype
 
 class c_bool(_ScalarCData):
-    _type_ = "?"
+    _type_ = '?'
     _jffi_type = jffi.Type.BOOL
 
 class c_byte(_ScalarCData):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.