Merge branch to reduce complexity and improve performance of mutlimethods

Author: aprilwade

cffi/etg.rst

@@ -251,13 +251,6 @@ It provides the following functions:
   the implementation.  If ``owner`` is ``None`` the reference is leaked and
   ``obj`` will never be deleted.
 
-``wrapper_lib.LD(expression)``
-  LD stands for "lazy default." This can be used in the default values for
-  function parameters to delay the evaluation of an expression until the whole
-  module has been initialized. This must be used for any default value that
-  references a wrapped variable or type. For example:
-  ``def some_func(param=wrapper_lib.LD('Size(10, 10)'):``
-
 ``wrapper_lib.check_exception()``
   Checks for an exception set in C++ code. This should follow most calls to C++
   code, though potentially following cleanup code for the call.

cffi/test/test_bindgen.cpp

@@ -705,3 +705,7 @@ int take_opaque_object(OpaqueType *obj)
 {
     return obj->i;
 }
+
+void take_broken_mapped_type(BrokenMappedType b)
+{
+}

cffi/test/test_bindgen.h

@@ -50,6 +50,12 @@ struct IntWrapper
     int i;
 };
 
+struct BrokenMappedType
+{
+};
+
+void take_broken_mapped_type(BrokenMappedType b);
+
 class VMethClass
 {
 public:

cffi/test/test_bindgen.py

@@ -699,6 +699,19 @@ def create_generators(cls):
             return isinstance(py_obj, numbers.Number)""",
             placeHolder='0'))
 
+        module.addItem(MappedTypeDef_cffi(
+            name='BrokenMappedType', cType='int',
+            py2c="raise TypeError('Message')",
+            c2py="",
+            c2cpp="return new BrokenMappedType();",
+            cpp2c="return 0;",
+            instanceCheck="return True",
+            placeHolder='0'))
+
+        module.addItem(FunctionDef(
+            type='void', name='take_broken_mapped_type',
+            items=ArgsString('(BrokenMappedType b)')))
+
         module.addItem(FunctionDef(
             type='int', argsString='(string *str)', name='std_string_len',
             items=[ParamDef(name='str', type='string *')],
@@ -1132,7 +1145,7 @@ def test_pure_virtual_method_private_overriding(self):
         assert o.pvmeth(20) == 10
 
         assert o.call_pvmeth() == 16
-        with pytest.raises(TypeError):
+        with pytest.raises(NotImplementedError):
             o.pvmeth()
 
     def test_subclass_virtual_method_direct_call(self):
@@ -2041,3 +2054,12 @@ def test_docstrings(self):
 
     def test_typedefs(self):
         obj = self.mod.CtorsAlias(10)
+
+    def test_conversion_failure(self):
+        try:
+            self.mod.take_broken_mapped_type(object())
+        except TypeError as e:
+            assert e.message == 'Message'
+        else:
+            # No exception raised
+            assert False

cffi/wrapper_lib/__init__.py

@@ -4,24 +4,17 @@
     forget_ptr, take_ownership, give_ownership, keep_reference, MappedBase,
     instancecheck, convert_to_type, init_wrapper, hassubclass, CastData)
 from multimethod import (
-    Multimethod, StaticMultimethod, ClassMultimethod, MMTypeCheckMeta,
-    check_args_types)
-from lazy_defaults import LD, eval_func_defaults
+    MMTypeCheckMeta, MMTypeError, MMInternalError, check_arg_type,
+    check_args_types, raise_mm_arg_failure)
 from annotations import create_array_type, allocate_cstring, allocate_cunicode
-from deprecated import deprecated
+from deprecated import deprecated_msg
 from exceptions import register_exception, check_exception
 from refcounting import adjust_refcount, get_refcounted_handle
 from abstract import (
     abstract_class, concrete_subclass, purevirtual_abstract_class)
 from voidptr import VoidPtrABC
 from defaults import default_arg_indicator
 
-def eval_class_attrs(cls):
-    for attr in cls.__dict__.itervalues():
-        eval_func_defaults(attr)
-        if isinstance(attr, (Multimethod, VirtualMethod)):
-            attr.finalize()
-
 classname_registry = {}
 
 def register_classname(name, cls):

cffi/wrapper_lib/cppwrapper.py

@@ -2,7 +2,6 @@
 import collections
 
 from _ffi import ffi, clib
-from multimethod import Multimethod
 
 
 class WrapperType(type):
@@ -175,18 +174,6 @@ def __set__(self, obj, value):
             for i in self.indices:
                 obj._vdata.set_vflag(obj, i)
 
-    def finalize(self):
-        if hasattr(self.func, 'finalize'):
-            self.func.finalize()
-
-    def overload(self, *args, **kwargs):
-        if not isinstance(self.func, Multimethod):
-            raise TypeError('overload may only used on virtual multimethods')
-        def closure(func):
-            self.func.overload(*args, **kwargs)(func)
-            return self
-        return closure
-
     def __repr__(self):
         return '<VirtualMethod%s: %s>' % (self.indices,
                                             repr(getattr(self, 'func', None)))

cffi/wrapper_lib/deprecated.py

@@ -1,29 +1,5 @@
 import warnings
-import functools
 
-def deprecated(arg):
-    if isinstance(arg, str):
-        return deprecated_method(arg)
-    else:
-        return deprecated_func(arg)
+def deprecated_msg(message):
+    warnings.warn(message, category=DeprecationWarning, stacklevel=3)
 
-
-def deprecated_func(func, message="{0}() is deprecated"):
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        warnings.warn(message.format(func.__name__),
-                      category=DeprecationWarning,
-                      stacklevel=3)
-
-        return func(*args, **kwargs)
-    wrapper._wrapped_func = func
-    return wrapper
-
-def deprecated_method(cls_name):
-    def closure(func):
-        if func.__name__ == '__init__':
-            message = cls_name + " constructor is deprecated"
-        else:
-            message = cls_name + ".{0}() is deprecated"
-        return deprecated_func(func, message)
-    return closure