Author: Ronan Lamy <[email protected]>
Branch: py3tests
Changeset: r94367:9b98fe93055e
Date: 2018-04-18 02:12 +0100
http://bitbucket.org/pypy/pypy/changeset/9b98fe93055e/
Log: fix _cffi_backend
diff --git a/pypy/module/_cffi_backend/__init__.py
b/pypy/module/_cffi_backend/__init__.py
--- a/pypy/module/_cffi_backend/__init__.py
+++ b/pypy/module/_cffi_backend/__init__.py
@@ -0,0 +1,1 @@
+VERSION = "1.11.5"
diff --git a/pypy/module/_cffi_backend/moduledef.py
b/pypy/module/_cffi_backend/moduledef.py
--- a/pypy/module/_cffi_backend/moduledef.py
+++ b/pypy/module/_cffi_backend/moduledef.py
@@ -2,8 +2,7 @@
from pypy.interpreter.mixedmodule import MixedModule
from rpython.rlib import rdynload, clibffi
from rpython.rtyper.lltypesystem import rffi
-
-VERSION = "1.11.5"
+from pypy.module._cffi_backend import VERSION
FFI_DEFAULT_ABI = clibffi.FFI_DEFAULT_ABI
try:
diff --git a/pypy/module/_cffi_backend/realize_c_type.py
b/pypy/module/_cffi_backend/realize_c_type.py
--- a/pypy/module/_cffi_backend/realize_c_type.py
+++ b/pypy/module/_cffi_backend/realize_c_type.py
@@ -5,7 +5,8 @@
from rpython.rtyper.lltypesystem import lltype, rffi
from pypy.interpreter.error import oefmt
from pypy.interpreter.baseobjspace import W_Root
-from pypy.module import _cffi_backend
+from pypy.module._cffi_backend.moduledef import (
+ FFI_DEFAULT_ABI, has_stdcall, FFI_STDCALL)
from pypy.module._cffi_backend.ctypeobj import W_CType
from pypy.module._cffi_backend import cffi_opcode, newtype, ctypestruct
from pypy.module._cffi_backend import ctypeprim
@@ -182,12 +183,12 @@
ellipsis = (getarg(opcodes[base_index + num_args]) & 0x01) != 0
abi = (getarg(opcodes[base_index + num_args]) & 0xFE)
if abi == 0:
- abi = _cffi_backend.FFI_DEFAULT_ABI
+ abi = FFI_DEFAULT_ABI
elif abi == 2:
- if _cffi_backend.has_stdcall:
- abi = _cffi_backend.FFI_STDCALL
+ if has_stdcall:
+ abi = FFI_STDCALL
else:
- abi = _cffi_backend.FFI_DEFAULT_ABI
+ abi = FFI_DEFAULT_ABI
else:
raise oefmt(ffi.w_FFIError, "abi number %d not supported", abi)
#
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
