Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r67907:3eaae5cfbc86
Date: 2013-11-09 08:45 -0800
http://bitbucket.org/pypy/pypy/changeset/3eaae5cfbc86/
Log: Simplify
diff --git a/pypy/module/_cffi_backend/ctypestruct.py
b/pypy/module/_cffi_backend/ctypestruct.py
--- a/pypy/module/_cffi_backend/ctypestruct.py
+++ b/pypy/module/_cffi_backend/ctypestruct.py
@@ -93,17 +93,11 @@
def convert_from_object(self, cdata, w_ob):
if not self._copy_from_same(cdata, w_ob):
- self.convert_struct_from_object(cdata, w_ob)
+ self.convert_struct_from_object(cdata, w_ob, optvarsize=-1)
- def convert_struct_from_object(self, cdata, w_ob, optvarsize=-1):
+ def convert_struct_from_object(self, cdata, w_ob, optvarsize):
self._check_only_one_argument_for_union(w_ob)
- self._convert_struct_from_object(cdata, w_ob, optvarsize)
- # XXX: needed because look_inside_iff doesn't like default args
- @jit.look_inside_iff(
- lambda self, cdata, w_ob, optvarsize: jit.isvirtual(w_ob)
- )
- def _convert_struct_from_object(self, cdata, w_ob, optvarsize):
space = self.space
if (space.isinstance_w(w_ob, space.w_list) or
space.isinstance_w(w_ob, space.w_tuple)):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
