Author: Armin Rigo <[email protected]>
Branch: ffi-backend
Changeset: r55857:0e4df1c1278c
Date: 2012-06-27 10:55 +0200
http://bitbucket.org/pypy/pypy/changeset/0e4df1c1278c/
Log: Rename _ffi_backend to _cffi_backend.
diff --git a/pypy/module/_ffi_backend/__init__.py
b/pypy/module/_cffi_backend/__init__.py
rename from pypy/module/_ffi_backend/__init__.py
rename to pypy/module/_cffi_backend/__init__.py
diff --git a/pypy/module/_ffi_backend/cdataobj.py
b/pypy/module/_cffi_backend/cdataobj.py
rename from pypy/module/_ffi_backend/cdataobj.py
rename to pypy/module/_cffi_backend/cdataobj.py
--- a/pypy/module/_ffi_backend/cdataobj.py
+++ b/pypy/module/_cffi_backend/cdataobj.py
@@ -7,7 +7,7 @@
from pypy.rlib.objectmodel import keepalive_until_here, specialize
from pypy.rlib import objectmodel, rgc
-from pypy.module._ffi_backend import misc
+from pypy.module._cffi_backend import misc
class W_CData(Wrappable):
@@ -15,7 +15,7 @@
cdata = lltype.nullptr(rffi.CCHARP.TO)
def __init__(self, space, cdata, ctype):
- from pypy.module._ffi_backend import ctypeprim
+ from pypy.module._cffi_backend import ctypeprim
assert lltype.typeOf(cdata) == rffi.CCHARP
assert isinstance(ctype, ctypeprim.W_CType)
self.space = space
@@ -48,7 +48,7 @@
return w_result
def len(self):
- from pypy.module._ffi_backend import ctypearray
+ from pypy.module._cffi_backend import ctypearray
space = self.space
if isinstance(self.ctype, ctypearray.W_CTypeArray):
return space.wrap(self.get_array_length())
@@ -110,7 +110,7 @@
space = self.space
ob = space.interpclass_w(w_other)
if isinstance(ob, W_CData):
- from pypy.module._ffi_backend import ctypeptr, ctypearray
+ from pypy.module._cffi_backend import ctypeptr, ctypearray
ct = ob.ctype
if isinstance(ct, ctypearray.W_CTypeArray):
ct = ct.ctptr
@@ -129,7 +129,7 @@
return self._add_or_sub(w_other, -1)
def getcfield(self, w_attr):
- from pypy.module._ffi_backend import ctypeptr, ctypestruct
+ from pypy.module._cffi_backend import ctypeptr, ctypestruct
space = self.space
ctype = self.ctype
attr = space.str_w(w_attr)
@@ -173,7 +173,7 @@
return w_obj
def get_array_length(self):
- from pypy.module._ffi_backend import ctypearray
+ from pypy.module._cffi_backend import ctypearray
ctype = self.ctype
assert isinstance(ctype, ctypearray.W_CTypeArray)
length = ctype.length
@@ -229,14 +229,14 @@
)
W_CData.typedef = TypeDef(
- '_ffi_backend.CData',
+ '_cffi_backend.CData',
__repr__ = interp2app(W_CData.repr),
**common_methods
)
W_CData.typedef.acceptable_as_base_class = False
W_CDataOwn.typedef = TypeDef(
- '_ffi_backend.CDataOwn',
+ '_cffi_backend.CDataOwn',
__base = W_CData.typedef,
__repr__ = interp2app(W_CDataOwn.repr),
__weakref__ = make_weakref_descr(W_CDataOwn),
diff --git a/pypy/module/_ffi_backend/ctypearray.py
b/pypy/module/_cffi_backend/ctypearray.py
rename from pypy/module/_ffi_backend/ctypearray.py
rename to pypy/module/_cffi_backend/ctypearray.py
--- a/pypy/module/_ffi_backend/ctypearray.py
+++ b/pypy/module/_cffi_backend/ctypearray.py
@@ -7,10 +7,10 @@
from pypy.rlib.objectmodel import keepalive_until_here
from pypy.rlib.rarithmetic import ovfcheck
-from pypy.module._ffi_backend.ctypeobj import W_CType
-from pypy.module._ffi_backend.ctypeprim import W_CTypePrimitiveChar
-from pypy.module._ffi_backend.ctypeptr import W_CTypePtrOrArray
-from pypy.module._ffi_backend import cdataobj
+from pypy.module._cffi_backend.ctypeobj import W_CType
+from pypy.module._cffi_backend.ctypeprim import W_CTypePrimitiveChar
+from pypy.module._cffi_backend.ctypeptr import W_CTypePtrOrArray
+from pypy.module._cffi_backend import cdataobj
class W_CTypeArray(W_CTypePtrOrArray):
diff --git a/pypy/module/_ffi_backend/ctypeenum.py
b/pypy/module/_cffi_backend/ctypeenum.py
rename from pypy/module/_ffi_backend/ctypeenum.py
rename to pypy/module/_cffi_backend/ctypeenum.py
--- a/pypy/module/_ffi_backend/ctypeenum.py
+++ b/pypy/module/_cffi_backend/ctypeenum.py
@@ -7,14 +7,14 @@
from pypy.rlib.rarithmetic import intmask
from pypy.rlib.objectmodel import keepalive_until_here
-from pypy.module._ffi_backend.ctypeprim import W_CTypePrimitiveSigned
-from pypy.module._ffi_backend import misc
+from pypy.module._cffi_backend.ctypeprim import W_CTypePrimitiveSigned
+from pypy.module._cffi_backend import misc
class W_CTypeEnum(W_CTypePrimitiveSigned):
def __init__(self, space, name, enumerators, enumvalues):
- from pypy.module._ffi_backend.newtype import alignment
+ from pypy.module._cffi_backend.newtype import alignment
name = "enum " + name
size = rffi.sizeof(rffi.INT)
align = alignment(rffi.INT)
diff --git a/pypy/module/_ffi_backend/ctypefunc.py
b/pypy/module/_cffi_backend/ctypefunc.py
rename from pypy/module/_ffi_backend/ctypefunc.py
rename to pypy/module/_cffi_backend/ctypefunc.py
--- a/pypy/module/_ffi_backend/ctypefunc.py
+++ b/pypy/module/_cffi_backend/ctypefunc.py
@@ -5,7 +5,7 @@
from pypy.rpython.lltypesystem import rffi
from pypy.rlib import clibffi
-from pypy.module._ffi_backend.ctypeptr import W_CTypePtrBase
+from pypy.module._cffi_backend.ctypeptr import W_CTypePtrBase
class W_CTypeFunc(W_CTypePtrBase):
diff --git a/pypy/module/_ffi_backend/ctypeobj.py
b/pypy/module/_cffi_backend/ctypeobj.py
rename from pypy/module/_ffi_backend/ctypeobj.py
rename to pypy/module/_cffi_backend/ctypeobj.py
--- a/pypy/module/_ffi_backend/ctypeobj.py
+++ b/pypy/module/_cffi_backend/ctypeobj.py
@@ -6,7 +6,7 @@
from pypy.rpython.lltypesystem import lltype, llmemory, rffi
from pypy.rlib.objectmodel import we_are_translated
-from pypy.module._ffi_backend import cdataobj
+from pypy.module._cffi_backend import cdataobj
class W_CType(Wrappable):
@@ -120,7 +120,7 @@
W_CType.typedef = TypeDef(
- '_ffi_backend.CTypeDescr',
+ '_cffi_backend.CTypeDescr',
__repr__ = interp2app(W_CType.repr),
__weakref__ = make_weakref_descr(W_CType),
)
diff --git a/pypy/module/_ffi_backend/ctypeprim.py
b/pypy/module/_cffi_backend/ctypeprim.py
rename from pypy/module/_ffi_backend/ctypeprim.py
rename to pypy/module/_cffi_backend/ctypeprim.py
--- a/pypy/module/_ffi_backend/ctypeprim.py
+++ b/pypy/module/_cffi_backend/ctypeprim.py
@@ -7,8 +7,8 @@
from pypy.rlib.rarithmetic import intmask, r_ulonglong
from pypy.rlib.objectmodel import keepalive_until_here
-from pypy.module._ffi_backend.ctypeobj import W_CType
-from pypy.module._ffi_backend import cdataobj, misc
+from pypy.module._cffi_backend.ctypeobj import W_CType
+from pypy.module._cffi_backend import cdataobj, misc
class W_CTypePrimitive(W_CType):
@@ -34,7 +34,7 @@
return ord(s[0])
def cast(self, w_ob):
- from pypy.module._ffi_backend import ctypeptr
+ from pypy.module._cffi_backend import ctypeptr
space = self.space
ob = space.interpclass_w(w_ob)
if (isinstance(ob, cdataobj.W_CData) and
diff --git a/pypy/module/_ffi_backend/ctypeptr.py
b/pypy/module/_cffi_backend/ctypeptr.py
rename from pypy/module/_ffi_backend/ctypeptr.py
rename to pypy/module/_cffi_backend/ctypeptr.py
--- a/pypy/module/_ffi_backend/ctypeptr.py
+++ b/pypy/module/_cffi_backend/ctypeptr.py
@@ -6,9 +6,9 @@
from pypy.rpython.lltypesystem import rffi
from pypy.rlib.objectmodel import keepalive_until_here
-from pypy.module._ffi_backend.ctypeobj import W_CType
-from pypy.module._ffi_backend.ctypeprim import W_CTypePrimitiveChar
-from pypy.module._ffi_backend import cdataobj, misc
+from pypy.module._cffi_backend.ctypeobj import W_CType
+from pypy.module._cffi_backend.ctypeprim import W_CTypePrimitiveChar
+from pypy.module._cffi_backend import cdataobj, misc
class W_CTypePtrOrArray(W_CType):
@@ -59,14 +59,14 @@
rffi.cast(rffi.CCHARPP, cdata)[0] = ob._cdata
def _alignof(self):
- from pypy.module._ffi_backend import newtype
+ from pypy.module._cffi_backend import newtype
return newtype.alignment_of_pointer
class W_CTypePointer(W_CTypePtrBase):
def __init__(self, space, ctitem):
- from pypy.module._ffi_backend import ctypearray
+ from pypy.module._cffi_backend import ctypearray
size = rffi.sizeof(rffi.VOIDP)
if isinstance(ctitem, ctypearray.W_CTypeArray):
extra = "(*)" # obscure case: see test_array_add
@@ -87,7 +87,7 @@
return W_CTypePtrOrArray.str(self, cdataobj)
def newp(self, w_init):
- from pypy.module._ffi_backend import ctypeprim
+ from pypy.module._cffi_backend import ctypeprim
space = self.space
ctitem = self.ctitem
datasize = ctitem.size
diff --git a/pypy/module/_ffi_backend/ctypestruct.py
b/pypy/module/_cffi_backend/ctypestruct.py
rename from pypy/module/_ffi_backend/ctypestruct.py
rename to pypy/module/_cffi_backend/ctypestruct.py
--- a/pypy/module/_ffi_backend/ctypestruct.py
+++ b/pypy/module/_cffi_backend/ctypestruct.py
@@ -8,8 +8,8 @@
from pypy.interpreter.typedef import TypeDef, interp_attrproperty
from pypy.rlib.objectmodel import keepalive_until_here
-from pypy.module._ffi_backend.ctypeobj import W_CType
-from pypy.module._ffi_backend import cdataobj
+from pypy.module._cffi_backend.ctypeobj import W_CType
+from pypy.module._cffi_backend import cdataobj
class W_CTypeStructOrUnion(W_CType):
@@ -148,7 +148,7 @@
W_CField.typedef = TypeDef(
- '_ffi_backend.CField',
+ '_cffi_backend.CField',
type = interp_attrproperty('ctype', W_CField),
offset = interp_attrproperty('offset', W_CField),
bitshift = interp_attrproperty('bitshift', W_CField),
diff --git a/pypy/module/_ffi_backend/ctypevoid.py
b/pypy/module/_cffi_backend/ctypevoid.py
rename from pypy/module/_ffi_backend/ctypevoid.py
rename to pypy/module/_cffi_backend/ctypevoid.py
--- a/pypy/module/_ffi_backend/ctypevoid.py
+++ b/pypy/module/_cffi_backend/ctypevoid.py
@@ -2,7 +2,7 @@
Void.
"""
-from pypy.module._ffi_backend.ctypeobj import W_CType
+from pypy.module._cffi_backend.ctypeobj import W_CType
class W_CTypeVoid(W_CType):
diff --git a/pypy/module/_ffi_backend/func.py
b/pypy/module/_cffi_backend/func.py
rename from pypy/module/_ffi_backend/func.py
rename to pypy/module/_cffi_backend/func.py
--- a/pypy/module/_ffi_backend/func.py
+++ b/pypy/module/_cffi_backend/func.py
@@ -3,7 +3,7 @@
from pypy.interpreter.gateway import interp2app, unwrap_spec
from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.module._ffi_backend import ctypeobj, cdataobj
+from pypy.module._cffi_backend import ctypeobj, cdataobj
# ____________________________________________________________
diff --git a/pypy/module/_ffi_backend/libraryobj.py
b/pypy/module/_cffi_backend/libraryobj.py
rename from pypy/module/_ffi_backend/libraryobj.py
rename to pypy/module/_cffi_backend/libraryobj.py
--- a/pypy/module/_ffi_backend/libraryobj.py
+++ b/pypy/module/_cffi_backend/libraryobj.py
@@ -33,7 +33,7 @@
W_Library.typedef = TypeDef(
- '_ffi_backend.Library',
+ '_cffi_backend.Library',
__repr__ = interp2app(W_Library.repr),
)
W_Library.acceptable_as_base_class = False
diff --git a/pypy/module/_ffi_backend/misc.py
b/pypy/module/_cffi_backend/misc.py
rename from pypy/module/_ffi_backend/misc.py
rename to pypy/module/_cffi_backend/misc.py
diff --git a/pypy/module/_ffi_backend/newtype.py
b/pypy/module/_cffi_backend/newtype.py
rename from pypy/module/_ffi_backend/newtype.py
rename to pypy/module/_cffi_backend/newtype.py
--- a/pypy/module/_ffi_backend/newtype.py
+++ b/pypy/module/_cffi_backend/newtype.py
@@ -3,8 +3,8 @@
from pypy.rpython.lltypesystem import lltype, rffi
from pypy.rlib.rarithmetic import ovfcheck
-from pypy.module._ffi_backend import ctypeobj, ctypeprim, ctypeptr, ctypearray
-from pypy.module._ffi_backend import ctypestruct, ctypevoid, ctypeenum
+from pypy.module._cffi_backend import ctypeobj, ctypeprim, ctypeptr, ctypearray
+from pypy.module._cffi_backend import ctypestruct, ctypevoid, ctypeenum
def alignment(TYPE):
@@ -205,7 +205,7 @@
@unwrap_spec(fresult=ctypeobj.W_CType, ellipsis=int)
def new_function_type(space, w_fargs, fresult, ellipsis=0):
- from pypy.module._ffi_backend import ctypefunc
+ from pypy.module._cffi_backend import ctypefunc
fargs = []
for w_farg in space.fixedview(w_fargs):
farg = space.interpclass_w(w_farg)
diff --git a/pypy/module/_ffi_backend/test/__init__.py
b/pypy/module/_cffi_backend/test/__init__.py
rename from pypy/module/_ffi_backend/test/__init__.py
rename to pypy/module/_cffi_backend/test/__init__.py
diff --git a/pypy/module/_ffi_backend/test/_backend_test_c.py
b/pypy/module/_cffi_backend/test/_backend_test_c.py
rename from pypy/module/_ffi_backend/test/_backend_test_c.py
rename to pypy/module/_cffi_backend/test/_backend_test_c.py
--- a/pypy/module/_ffi_backend/test/_backend_test_c.py
+++ b/pypy/module/_cffi_backend/test/_backend_test_c.py
@@ -39,7 +39,7 @@
p = new_primitive_type("signed char")
x = cast(p, -65 + 17*256)
assert repr(x) == "<cdata 'signed char' -65>"
- assert repr(type(x)) == "<type '_ffi_backend.CData'>"
+ assert repr(type(x)) == "<type '_cffi_backend.CData'>"
assert int(x) == -65
x = cast(p, -66 + (1<<199)*256)
assert repr(x) == "<cdata 'signed char' -66>"
diff --git a/pypy/module/_ffi_backend/test/test_c.py
b/pypy/module/_cffi_backend/test/test_c.py
rename from pypy/module/_ffi_backend/test/test_c.py
rename to pypy/module/_cffi_backend/test/test_c.py
--- a/pypy/module/_ffi_backend/test/test_c.py
+++ b/pypy/module/_cffi_backend/test/test_c.py
@@ -7,15 +7,15 @@
from pypy.tool.udir import udir
from pypy.conftest import gettestobjspace
from pypy.interpreter import gateway
-from pypy.module._ffi_backend.test import _backend_test_c
-from pypy.module._ffi_backend import Module
+from pypy.module._cffi_backend.test import _backend_test_c
+from pypy.module._cffi_backend import Module
class AppTestC(object):
"""Populated below, hack hack hack."""
def setup_class(cls):
- space = gettestobjspace(usemodules=('_ffi_backend',))
+ space = gettestobjspace(usemodules=('_cffi_backend',))
cls.space = space
testfuncs_w = []
keepalive_funcs = []
@@ -24,8 +24,8 @@
import ctypes.util
path = ctypes.util.find_library(space.str_w(w_name))
return space.appexec([space.wrap(path)], """(path):
- import _ffi_backend
- return _ffi_backend.load_library(path)""")
+ import _cffi_backend
+ return _cffi_backend.load_library(path)""")
def testfunc0(a, b):
return chr(ord(a) + ord(b))
@@ -76,7 +76,7 @@
tmpname2 = tmpdir.join('_all_test_c.py')
with tmpname2.open('w') as f:
print >> f, 'import sys'
- print >> f, 'from _ffi_backend import %s' % all_names
+ print >> f, 'from _cffi_backend import %s' % all_names
print >> f, 'class py:'
print >> f, ' class test:'
print >> f, ' raises = staticmethod(raises)'
diff --git a/pypy/module/_ffi_backend/test/test_file.py
b/pypy/module/_cffi_backend/test/test_file.py
rename from pypy/module/_ffi_backend/test/test_file.py
rename to pypy/module/_cffi_backend/test/test_file.py
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
