[Jython-checkins] SF.net SVN: jython:[6969] branches/ctypes-jffi

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

Revision: 6969
          http://jython.svn.sourceforge.net/jython/?rev=6969&view=rev
Author:   wmeissner
Date:     2010-01-30 10:14:30 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Fixes for CType changes

Modified Paths:
--------------
    branches/ctypes-jffi/Lib/ctypes/__init__.py
    branches/ctypes-jffi/src/org/python/modules/jffi/CType.java

Modified: branches/ctypes-jffi/Lib/ctypes/__init__.py
===================================================================
--- branches/ctypes-jffi/Lib/ctypes/__init__.py	2010-01-30 08:08:55 UTC (rev 6968)
+++ branches/ctypes-jffi/Lib/ctypes/__init__.py	2010-01-30 10:14:30 UTC (rev 6969)
@@ -43,7 +43,7 @@
 
     @classmethod
     def size(self):
-        return self._jffi_type.size
+        return self._jffi_type.size()
 
 class _ScalarCData(jffi.ScalarCData, _CData):
     __metaclass__ = _CTypeMetaClass
@@ -136,12 +136,12 @@
 
 def sizeof(type):
     if hasattr(type, '_jffi_type'):
-        return type._jffi_type.size
+        return type._jffi_type.size()
     else:
         raise TypeError("this type has no size")
 
 def alignment(type):
-    return type._jffi_type.alignment
+    return type._jffi_type.alignment()
 
 def addressof(cdata):
     return cdata.address()

Modified: branches/ctypes-jffi/src/org/python/modules/jffi/CType.java
===================================================================
--- branches/ctypes-jffi/src/org/python/modules/jffi/CType.java	2010-01-30 08:08:55 UTC (rev 6968)
+++ branches/ctypes-jffi/src/org/python/modules/jffi/CType.java	2010-01-30 10:14:30 UTC (rev 6969)
@@ -96,7 +96,8 @@
         }
     }
 
-    static abstract class Custom extends CType implements ExposeAsSuperclass {
+    @ExposedType(name = "jffi.Type.Custom", base = CType.class)
+    static class Custom extends CType {
         final com.kenai.jffi.Type jffiType;
         
         public Custom(NativeType type, com.kenai.jffi.Type jffiType, MemoryOp op) {


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