[pypy-svn] r50580 - in pypy/branch/applevel-ctypes2/pypy/module/_rawffi: . test

[arigo at codespeak.net]

Author: arigo
Date: Mon Jan 14 11:27:57 2008
New Revision: 50580

Added:
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/interp_rawffi.py
      - copied, changed from r50579, pypy/branch/applevel-ctypes2/pypy/module/_rawffi/interp_ffi.py
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/test/test__rawffi.py
      - copied, changed from r50579, pypy/branch/applevel-ctypes2/pypy/module/_rawffi/test/test__ffi.py
Removed:
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/interp_ffi.py
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/test/test__ffi.py
Modified:
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/__init__.py
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/array.py
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/callback.py
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/structure.py
   pypy/branch/applevel-ctypes2/pypy/module/_rawffi/test/test_struct.py
Log:
Rename files and fix imports.


Modified: pypy/branch/applevel-ctypes2/pypy/module/_rawffi/__init__.py
==============================================================================
--- pypy/branch/applevel-ctypes2/pypy/module/_rawffi/__init__.py	(original)
+++ pypy/branch/applevel-ctypes2/pypy/module/_rawffi/__init__.py	Mon Jan 14 11:27:57 2008
@@ -3,22 +3,22 @@
 """
 
 from pypy.interpreter.mixedmodule import MixedModule
-from pypy.module._ffi.interp_ffi import W_CDLL
+from pypy.module._rawffi.interp_rawffi import W_CDLL
 from pypy.rpython.lltypesystem import lltype, rffi
 
 class Module(MixedModule):
-    applevelname = '_ffi'
+    applevelname = '_rawffi'
 
     interpleveldefs = {
-        'CDLL'               : 'interp_ffi.W_CDLL',
-        'FuncPtr'            : 'interp_ffi.W_FuncPtr',
+        'CDLL'               : 'interp_rawffi.W_CDLL',
+        'FuncPtr'            : 'interp_rawffi.W_FuncPtr',
         'Structure'          : 'structure.W_Structure',
         'StructureInstance'  : 'structure.W_StructureInstance',
         'Array'              : 'array.W_Array',
         'ArrayInstance'      : 'array.W_ArrayInstance',
-        '_get_type'          : 'interp_ffi._w_get_type',
-        'sizeof'             : 'interp_ffi.sizeof',
-        'alignment'          : 'interp_ffi.alignment',
+        '_get_type'          : 'interp_rawffi._w_get_type',
+        'sizeof'             : 'interp_rawffi.sizeof',
+        'alignment'          : 'interp_rawffi.alignment',
         #'CallbackPtr'        : 'callback.W_CallbackPtr',
     }
 

Modified: pypy/branch/applevel-ctypes2/pypy/module/_rawffi/array.py
==============================================================================
--- pypy/branch/applevel-ctypes2/pypy/module/_rawffi/array.py	(original)
+++ pypy/branch/applevel-ctypes2/pypy/module/_rawffi/array.py	Mon Jan 14 11:27:57 2008
@@ -9,8 +9,8 @@
 from pypy.interpreter.typedef import TypeDef, GetSetProperty, interp_attrproperty
 from pypy.rpython.lltypesystem import lltype, rffi
 from pypy.interpreter.error import OperationError, wrap_oserror
-from pypy.module._ffi.structure import segfault_exception
-from pypy.module._ffi.interp_ffi import unwrap_value, wrap_value, _get_type,\
+from pypy.module._rawffi.structure import segfault_exception
+from pypy.module._rawffi.interp_rawffi import unwrap_value, wrap_value, _get_type,\
      TYPEMAP
 from pypy.rlib.rarithmetic import intmask
 

Modified: pypy/branch/applevel-ctypes2/pypy/module/_rawffi/callback.py
==============================================================================
--- pypy/branch/applevel-ctypes2/pypy/module/_rawffi/callback.py	(original)
+++ pypy/branch/applevel-ctypes2/pypy/module/_rawffi/callback.py	Mon Jan 14 11:27:57 2008
@@ -4,7 +4,7 @@
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
 from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.module._ffi.structure import unpack_fields
+from pypy.module._rawffi.structure import unpack_fields
 
 def stuff(a, b):
     print "comparing"

Modified: pypy/branch/applevel-ctypes2/pypy/module/_rawffi/structure.py
==============================================================================
--- pypy/branch/applevel-ctypes2/pypy/module/_rawffi/structure.py	(original)
+++ pypy/branch/applevel-ctypes2/pypy/module/_rawffi/structure.py	Mon Jan 14 11:27:57 2008
@@ -10,7 +10,7 @@
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
 from pypy.rpython.lltypesystem import lltype, rffi
 from pypy.interpreter.error import OperationError, wrap_oserror
-from pypy.module._ffi.interp_ffi import wrap_value, unwrap_value, _get_type,\
+from pypy.module._rawffi.interp_rawffi import wrap_value, unwrap_value, _get_type,\
      TYPEMAP
 from pypy.rlib.rarithmetic import intmask
 
@@ -97,7 +97,7 @@
 cast_pos._annspecialcase_ = 'specialize:arg(2)'
 
 def segfault_exception(space, reason):
-    w_mod = space.getbuiltinmodule("_ffi")
+    w_mod = space.getbuiltinmodule("_rawffi")
     w_exception = space.getattr(w_mod, space.wrap("SegfaultException"))
     return OperationError(w_exception, space.wrap(reason))
 

Modified: pypy/branch/applevel-ctypes2/pypy/module/_rawffi/test/test_struct.py
==============================================================================
--- pypy/branch/applevel-ctypes2/pypy/module/_rawffi/test/test_struct.py	(original)
+++ pypy/branch/applevel-ctypes2/pypy/module/_rawffi/test/test_struct.py	Mon Jan 14 11:27:57 2008
@@ -1,5 +1,5 @@
 
-from pypy.module._ffi.structure import size_and_pos
+from pypy.module._rawffi.structure import size_and_pos
 
 sizeof = lambda x : size_and_pos(x)[0]