[pypy-commit] pypy release-2.3.x: merge default
bdkearns
noreply at buildbot.pypy.org
Sat May 3 21:52:53 CEST 2014
Author: Brian Kearns <bdkearns at gmail.com>
Branch: release-2.3.x
Changeset: r71236:1644666ea5d3
Date: 2014-05-03 15:51 -0400
http://bitbucket.org/pypy/pypy/changeset/1644666ea5d3/
Log: merge default
diff too long, truncating to 2000 out of 2849 lines
diff --git a/pypy/doc/release-2.3.0.rst b/pypy/doc/release-2.3.0.rst
--- a/pypy/doc/release-2.3.0.rst
+++ b/pypy/doc/release-2.3.0.rst
@@ -87,6 +87,10 @@
* Support for corner cases on objects with __int__ and __float__ methods
+* Fix multithreaded support for gethostbyname_ex and gethostbyaddr
+
+* Fix handling of tp_name for type objects
+
.. _`HippyVM`: http://www.hippyvm.com
New Platforms and Features
diff --git a/pypy/doc/whatsnew-2.3.0.rst b/pypy/doc/whatsnew-2.3.0.rst
--- a/pypy/doc/whatsnew-2.3.0.rst
+++ b/pypy/doc/whatsnew-2.3.0.rst
@@ -164,3 +164,6 @@
.. branch: issue1430
Add a lock for unsafe calls to gethostbyname and gethostbyaddr
+
+.. branch: fix-tpname
+Changes hacks surrounding W_TypeObject.name to match CPython's tp_name
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -3,5 +3,4 @@
=======================
.. this is a revision shortly after release-2.3.x
-.. startrev: 773fc6275c69
-
+.. startrev: ec864bd08d50
diff --git a/pypy/interpreter/astcompiler/ast.py b/pypy/interpreter/astcompiler/ast.py
--- a/pypy/interpreter/astcompiler/ast.py
+++ b/pypy/interpreter/astcompiler/ast.py
@@ -121,10 +121,9 @@
for field, w_value in kwargs_w.iteritems():
space.setattr(w_self, space.wrap(field), w_value)
-AST.typedef = typedef.TypeDef("AST",
+AST.typedef = typedef.TypeDef("_ast.AST",
_fields=_FieldsWrapper([]),
_attributes=_FieldsWrapper([]),
- __module__='_ast',
__reduce__=interp2app(AST.reduce_w),
__setstate__=interp2app(AST.setstate_w),
__dict__ = typedef.GetSetProperty(typedef.descr_get_dict,
@@ -2804,6 +2803,7 @@
_attributes=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(mod)),
)
+mod.typedef.heaptype = True
def Module_get_body(space, w_self):
if not w_self.initialization_state & 1:
@@ -2851,6 +2851,7 @@
__new__=interp2app(get_AST_new(Module)),
__init__=interp2app(Module_init),
)
+Module.typedef.heaptype = True
def Interactive_get_body(space, w_self):
if not w_self.initialization_state & 1:
@@ -2898,6 +2899,7 @@
__new__=interp2app(get_AST_new(Interactive)),
__init__=interp2app(Interactive_init),
)
+Interactive.typedef.heaptype = True
def Expression_get_body(space, w_self):
if w_self.w_dict is not None:
@@ -2951,6 +2953,7 @@
__new__=interp2app(get_AST_new(Expression)),
__init__=interp2app(Expression_init),
)
+Expression.typedef.heaptype = True
def Suite_get_body(space, w_self):
if not w_self.initialization_state & 1:
@@ -2998,6 +3001,7 @@
__new__=interp2app(get_AST_new(Suite)),
__init__=interp2app(Suite_init),
)
+Suite.typedef.heaptype = True
def stmt_get_lineno(space, w_self):
if w_self.w_dict is not None:
@@ -3063,6 +3067,7 @@
col_offset=typedef.GetSetProperty(stmt_get_col_offset, stmt_set_col_offset, stmt_del_col_offset, cls=stmt),
__new__=interp2app(get_AST_new(stmt)),
)
+stmt.typedef.heaptype = True
def FunctionDef_get_name(space, w_self):
if w_self.w_dict is not None:
@@ -3191,6 +3196,7 @@
__new__=interp2app(get_AST_new(FunctionDef)),
__init__=interp2app(FunctionDef_init),
)
+FunctionDef.typedef.heaptype = True
def ClassDef_get_name(space, w_self):
if w_self.w_dict is not None:
@@ -3315,6 +3321,7 @@
__new__=interp2app(get_AST_new(ClassDef)),
__init__=interp2app(ClassDef_init),
)
+ClassDef.typedef.heaptype = True
def Return_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -3368,6 +3375,7 @@
__new__=interp2app(get_AST_new(Return)),
__init__=interp2app(Return_init),
)
+Return.typedef.heaptype = True
def Delete_get_targets(space, w_self):
if not w_self.initialization_state & 4:
@@ -3415,6 +3423,7 @@
__new__=interp2app(get_AST_new(Delete)),
__init__=interp2app(Delete_init),
)
+Delete.typedef.heaptype = True
def Assign_get_targets(space, w_self):
if not w_self.initialization_state & 4:
@@ -3492,6 +3501,7 @@
__new__=interp2app(get_AST_new(Assign)),
__init__=interp2app(Assign_init),
)
+Assign.typedef.heaptype = True
def AugAssign_get_target(space, w_self):
if w_self.w_dict is not None:
@@ -3605,6 +3615,7 @@
__new__=interp2app(get_AST_new(AugAssign)),
__init__=interp2app(AugAssign_init),
)
+AugAssign.typedef.heaptype = True
def Print_get_dest(space, w_self):
if w_self.w_dict is not None:
@@ -3711,6 +3722,7 @@
__new__=interp2app(get_AST_new(Print)),
__init__=interp2app(Print_init),
)
+Print.typedef.heaptype = True
def For_get_target(space, w_self):
if w_self.w_dict is not None:
@@ -3842,6 +3854,7 @@
__new__=interp2app(get_AST_new(For)),
__init__=interp2app(For_init),
)
+For.typedef.heaptype = True
def While_get_test(space, w_self):
if w_self.w_dict is not None:
@@ -3943,6 +3956,7 @@
__new__=interp2app(get_AST_new(While)),
__init__=interp2app(While_init),
)
+While.typedef.heaptype = True
def If_get_test(space, w_self):
if w_self.w_dict is not None:
@@ -4044,6 +4058,7 @@
__new__=interp2app(get_AST_new(If)),
__init__=interp2app(If_init),
)
+If.typedef.heaptype = True
def With_get_context_expr(space, w_self):
if w_self.w_dict is not None:
@@ -4151,6 +4166,7 @@
__new__=interp2app(get_AST_new(With)),
__init__=interp2app(With_init),
)
+With.typedef.heaptype = True
def Raise_get_type(space, w_self):
if w_self.w_dict is not None:
@@ -4264,6 +4280,7 @@
__new__=interp2app(get_AST_new(Raise)),
__init__=interp2app(Raise_init),
)
+Raise.typedef.heaptype = True
def TryExcept_get_body(space, w_self):
if not w_self.initialization_state & 4:
@@ -4359,6 +4376,7 @@
__new__=interp2app(get_AST_new(TryExcept)),
__init__=interp2app(TryExcept_init),
)
+TryExcept.typedef.heaptype = True
def TryFinally_get_body(space, w_self):
if not w_self.initialization_state & 4:
@@ -4430,6 +4448,7 @@
__new__=interp2app(get_AST_new(TryFinally)),
__init__=interp2app(TryFinally_init),
)
+TryFinally.typedef.heaptype = True
def Assert_get_test(space, w_self):
if w_self.w_dict is not None:
@@ -4513,6 +4532,7 @@
__new__=interp2app(get_AST_new(Assert)),
__init__=interp2app(Assert_init),
)
+Assert.typedef.heaptype = True
def Import_get_names(space, w_self):
if not w_self.initialization_state & 4:
@@ -4560,6 +4580,7 @@
__new__=interp2app(get_AST_new(Import)),
__init__=interp2app(Import_init),
)
+Import.typedef.heaptype = True
def ImportFrom_get_module(space, w_self):
if w_self.w_dict is not None:
@@ -4668,6 +4689,7 @@
__new__=interp2app(get_AST_new(ImportFrom)),
__init__=interp2app(ImportFrom_init),
)
+ImportFrom.typedef.heaptype = True
def Exec_get_body(space, w_self):
if w_self.w_dict is not None:
@@ -4781,6 +4803,7 @@
__new__=interp2app(get_AST_new(Exec)),
__init__=interp2app(Exec_init),
)
+Exec.typedef.heaptype = True
def Global_get_names(space, w_self):
if not w_self.initialization_state & 4:
@@ -4828,6 +4851,7 @@
__new__=interp2app(get_AST_new(Global)),
__init__=interp2app(Global_init),
)
+Global.typedef.heaptype = True
def Expr_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -4881,6 +4905,7 @@
__new__=interp2app(get_AST_new(Expr)),
__init__=interp2app(Expr_init),
)
+Expr.typedef.heaptype = True
def Pass_init(space, w_self, __args__):
w_self = space.descr_self_interp_w(Pass, w_self)
@@ -4898,6 +4923,7 @@
__new__=interp2app(get_AST_new(Pass)),
__init__=interp2app(Pass_init),
)
+Pass.typedef.heaptype = True
def Break_init(space, w_self, __args__):
w_self = space.descr_self_interp_w(Break, w_self)
@@ -4915,6 +4941,7 @@
__new__=interp2app(get_AST_new(Break)),
__init__=interp2app(Break_init),
)
+Break.typedef.heaptype = True
def Continue_init(space, w_self, __args__):
w_self = space.descr_self_interp_w(Continue, w_self)
@@ -4932,6 +4959,7 @@
__new__=interp2app(get_AST_new(Continue)),
__init__=interp2app(Continue_init),
)
+Continue.typedef.heaptype = True
def expr_get_lineno(space, w_self):
if w_self.w_dict is not None:
@@ -4997,6 +5025,7 @@
col_offset=typedef.GetSetProperty(expr_get_col_offset, expr_set_col_offset, expr_del_col_offset, cls=expr),
__new__=interp2app(get_AST_new(expr)),
)
+expr.typedef.heaptype = True
def BoolOp_get_op(space, w_self):
if w_self.w_dict is not None:
@@ -5074,6 +5103,7 @@
__new__=interp2app(get_AST_new(BoolOp)),
__init__=interp2app(BoolOp_init),
)
+BoolOp.typedef.heaptype = True
def BinOp_get_left(space, w_self):
if w_self.w_dict is not None:
@@ -5187,6 +5217,7 @@
__new__=interp2app(get_AST_new(BinOp)),
__init__=interp2app(BinOp_init),
)
+BinOp.typedef.heaptype = True
def UnaryOp_get_op(space, w_self):
if w_self.w_dict is not None:
@@ -5270,6 +5301,7 @@
__new__=interp2app(get_AST_new(UnaryOp)),
__init__=interp2app(UnaryOp_init),
)
+UnaryOp.typedef.heaptype = True
def Lambda_get_args(space, w_self):
if w_self.w_dict is not None:
@@ -5351,6 +5383,7 @@
__new__=interp2app(get_AST_new(Lambda)),
__init__=interp2app(Lambda_init),
)
+Lambda.typedef.heaptype = True
def IfExp_get_test(space, w_self):
if w_self.w_dict is not None:
@@ -5464,6 +5497,7 @@
__new__=interp2app(get_AST_new(IfExp)),
__init__=interp2app(IfExp_init),
)
+IfExp.typedef.heaptype = True
def Dict_get_keys(space, w_self):
if not w_self.initialization_state & 4:
@@ -5535,6 +5569,7 @@
__new__=interp2app(get_AST_new(Dict)),
__init__=interp2app(Dict_init),
)
+Dict.typedef.heaptype = True
def Set_get_elts(space, w_self):
if not w_self.initialization_state & 4:
@@ -5582,6 +5617,7 @@
__new__=interp2app(get_AST_new(Set)),
__init__=interp2app(Set_init),
)
+Set.typedef.heaptype = True
def ListComp_get_elt(space, w_self):
if w_self.w_dict is not None:
@@ -5659,6 +5695,7 @@
__new__=interp2app(get_AST_new(ListComp)),
__init__=interp2app(ListComp_init),
)
+ListComp.typedef.heaptype = True
def SetComp_get_elt(space, w_self):
if w_self.w_dict is not None:
@@ -5736,6 +5773,7 @@
__new__=interp2app(get_AST_new(SetComp)),
__init__=interp2app(SetComp_init),
)
+SetComp.typedef.heaptype = True
def DictComp_get_key(space, w_self):
if w_self.w_dict is not None:
@@ -5843,6 +5881,7 @@
__new__=interp2app(get_AST_new(DictComp)),
__init__=interp2app(DictComp_init),
)
+DictComp.typedef.heaptype = True
def GeneratorExp_get_elt(space, w_self):
if w_self.w_dict is not None:
@@ -5920,6 +5959,7 @@
__new__=interp2app(get_AST_new(GeneratorExp)),
__init__=interp2app(GeneratorExp_init),
)
+GeneratorExp.typedef.heaptype = True
def Yield_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -5973,6 +6013,7 @@
__new__=interp2app(get_AST_new(Yield)),
__init__=interp2app(Yield_init),
)
+Yield.typedef.heaptype = True
def Compare_get_left(space, w_self):
if w_self.w_dict is not None:
@@ -6074,6 +6115,7 @@
__new__=interp2app(get_AST_new(Compare)),
__init__=interp2app(Compare_init),
)
+Compare.typedef.heaptype = True
def Call_get_func(space, w_self):
if w_self.w_dict is not None:
@@ -6235,6 +6277,7 @@
__new__=interp2app(get_AST_new(Call)),
__init__=interp2app(Call_init),
)
+Call.typedef.heaptype = True
def Repr_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -6288,6 +6331,7 @@
__new__=interp2app(get_AST_new(Repr)),
__init__=interp2app(Repr_init),
)
+Repr.typedef.heaptype = True
def Num_get_n(space, w_self):
if w_self.w_dict is not None:
@@ -6340,6 +6384,7 @@
__new__=interp2app(get_AST_new(Num)),
__init__=interp2app(Num_init),
)
+Num.typedef.heaptype = True
def Str_get_s(space, w_self):
if w_self.w_dict is not None:
@@ -6392,6 +6437,7 @@
__new__=interp2app(get_AST_new(Str)),
__init__=interp2app(Str_init),
)
+Str.typedef.heaptype = True
def Attribute_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -6504,6 +6550,7 @@
__new__=interp2app(get_AST_new(Attribute)),
__init__=interp2app(Attribute_init),
)
+Attribute.typedef.heaptype = True
def Subscript_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -6617,6 +6664,7 @@
__new__=interp2app(get_AST_new(Subscript)),
__init__=interp2app(Subscript_init),
)
+Subscript.typedef.heaptype = True
def Name_get_id(space, w_self):
if w_self.w_dict is not None:
@@ -6699,6 +6747,7 @@
__new__=interp2app(get_AST_new(Name)),
__init__=interp2app(Name_init),
)
+Name.typedef.heaptype = True
def List_get_elts(space, w_self):
if not w_self.initialization_state & 4:
@@ -6776,6 +6825,7 @@
__new__=interp2app(get_AST_new(List)),
__init__=interp2app(List_init),
)
+List.typedef.heaptype = True
def Tuple_get_elts(space, w_self):
if not w_self.initialization_state & 4:
@@ -6853,6 +6903,7 @@
__new__=interp2app(get_AST_new(Tuple)),
__init__=interp2app(Tuple_init),
)
+Tuple.typedef.heaptype = True
def Const_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -6905,6 +6956,7 @@
__new__=interp2app(get_AST_new(Const)),
__init__=interp2app(Const_init),
)
+Const.typedef.heaptype = True
expr_context.typedef = typedef.TypeDef("expr_context",
AST.typedef,
@@ -6912,6 +6964,7 @@
_attributes=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(expr_context)),
)
+expr_context.typedef.heaptype = True
_Load.typedef = typedef.TypeDef("Load",
expr_context.typedef,
@@ -6919,6 +6972,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Load)),
)
+_Load.typedef.heaptype = True
_Store.typedef = typedef.TypeDef("Store",
expr_context.typedef,
@@ -6926,6 +6980,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Store)),
)
+_Store.typedef.heaptype = True
_Del.typedef = typedef.TypeDef("Del",
expr_context.typedef,
@@ -6933,6 +6988,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Del)),
)
+_Del.typedef.heaptype = True
_AugLoad.typedef = typedef.TypeDef("AugLoad",
expr_context.typedef,
@@ -6940,6 +6996,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_AugLoad)),
)
+_AugLoad.typedef.heaptype = True
_AugStore.typedef = typedef.TypeDef("AugStore",
expr_context.typedef,
@@ -6947,6 +7004,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_AugStore)),
)
+_AugStore.typedef.heaptype = True
_Param.typedef = typedef.TypeDef("Param",
expr_context.typedef,
@@ -6954,6 +7012,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Param)),
)
+_Param.typedef.heaptype = True
slice.typedef = typedef.TypeDef("slice",
AST.typedef,
@@ -6961,6 +7020,7 @@
_attributes=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(slice)),
)
+slice.typedef.heaptype = True
def Ellipsis_init(space, w_self, __args__):
w_self = space.descr_self_interp_w(Ellipsis, w_self)
@@ -6978,6 +7038,7 @@
__new__=interp2app(get_AST_new(Ellipsis)),
__init__=interp2app(Ellipsis_init),
)
+Ellipsis.typedef.heaptype = True
def Slice_get_lower(space, w_self):
if w_self.w_dict is not None:
@@ -7091,6 +7152,7 @@
__new__=interp2app(get_AST_new(Slice)),
__init__=interp2app(Slice_init),
)
+Slice.typedef.heaptype = True
def ExtSlice_get_dims(space, w_self):
if not w_self.initialization_state & 1:
@@ -7138,6 +7200,7 @@
__new__=interp2app(get_AST_new(ExtSlice)),
__init__=interp2app(ExtSlice_init),
)
+ExtSlice.typedef.heaptype = True
def Index_get_value(space, w_self):
if w_self.w_dict is not None:
@@ -7191,6 +7254,7 @@
__new__=interp2app(get_AST_new(Index)),
__init__=interp2app(Index_init),
)
+Index.typedef.heaptype = True
boolop.typedef = typedef.TypeDef("boolop",
AST.typedef,
@@ -7198,6 +7262,7 @@
_attributes=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(boolop)),
)
+boolop.typedef.heaptype = True
_And.typedef = typedef.TypeDef("And",
boolop.typedef,
@@ -7205,6 +7270,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_And)),
)
+_And.typedef.heaptype = True
_Or.typedef = typedef.TypeDef("Or",
boolop.typedef,
@@ -7212,6 +7278,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Or)),
)
+_Or.typedef.heaptype = True
operator.typedef = typedef.TypeDef("operator",
AST.typedef,
@@ -7219,6 +7286,7 @@
_attributes=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(operator)),
)
+operator.typedef.heaptype = True
_Add.typedef = typedef.TypeDef("Add",
operator.typedef,
@@ -7226,6 +7294,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Add)),
)
+_Add.typedef.heaptype = True
_Sub.typedef = typedef.TypeDef("Sub",
operator.typedef,
@@ -7233,6 +7302,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Sub)),
)
+_Sub.typedef.heaptype = True
_Mult.typedef = typedef.TypeDef("Mult",
operator.typedef,
@@ -7240,6 +7310,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Mult)),
)
+_Mult.typedef.heaptype = True
_Div.typedef = typedef.TypeDef("Div",
operator.typedef,
@@ -7247,6 +7318,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Div)),
)
+_Div.typedef.heaptype = True
_Mod.typedef = typedef.TypeDef("Mod",
operator.typedef,
@@ -7254,6 +7326,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Mod)),
)
+_Mod.typedef.heaptype = True
_Pow.typedef = typedef.TypeDef("Pow",
operator.typedef,
@@ -7261,6 +7334,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Pow)),
)
+_Pow.typedef.heaptype = True
_LShift.typedef = typedef.TypeDef("LShift",
operator.typedef,
@@ -7268,6 +7342,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_LShift)),
)
+_LShift.typedef.heaptype = True
_RShift.typedef = typedef.TypeDef("RShift",
operator.typedef,
@@ -7275,6 +7350,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_RShift)),
)
+_RShift.typedef.heaptype = True
_BitOr.typedef = typedef.TypeDef("BitOr",
operator.typedef,
@@ -7282,6 +7358,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_BitOr)),
)
+_BitOr.typedef.heaptype = True
_BitXor.typedef = typedef.TypeDef("BitXor",
operator.typedef,
@@ -7289,6 +7366,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_BitXor)),
)
+_BitXor.typedef.heaptype = True
_BitAnd.typedef = typedef.TypeDef("BitAnd",
operator.typedef,
@@ -7296,6 +7374,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_BitAnd)),
)
+_BitAnd.typedef.heaptype = True
_FloorDiv.typedef = typedef.TypeDef("FloorDiv",
operator.typedef,
@@ -7303,6 +7382,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_FloorDiv)),
)
+_FloorDiv.typedef.heaptype = True
unaryop.typedef = typedef.TypeDef("unaryop",
AST.typedef,
@@ -7310,6 +7390,7 @@
_attributes=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(unaryop)),
)
+unaryop.typedef.heaptype = True
_Invert.typedef = typedef.TypeDef("Invert",
unaryop.typedef,
@@ -7317,6 +7398,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Invert)),
)
+_Invert.typedef.heaptype = True
_Not.typedef = typedef.TypeDef("Not",
unaryop.typedef,
@@ -7324,6 +7406,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Not)),
)
+_Not.typedef.heaptype = True
_UAdd.typedef = typedef.TypeDef("UAdd",
unaryop.typedef,
@@ -7331,6 +7414,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_UAdd)),
)
+_UAdd.typedef.heaptype = True
_USub.typedef = typedef.TypeDef("USub",
unaryop.typedef,
@@ -7338,6 +7422,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_USub)),
)
+_USub.typedef.heaptype = True
cmpop.typedef = typedef.TypeDef("cmpop",
AST.typedef,
@@ -7345,6 +7430,7 @@
_attributes=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(cmpop)),
)
+cmpop.typedef.heaptype = True
_Eq.typedef = typedef.TypeDef("Eq",
cmpop.typedef,
@@ -7352,6 +7438,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Eq)),
)
+_Eq.typedef.heaptype = True
_NotEq.typedef = typedef.TypeDef("NotEq",
cmpop.typedef,
@@ -7359,6 +7446,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_NotEq)),
)
+_NotEq.typedef.heaptype = True
_Lt.typedef = typedef.TypeDef("Lt",
cmpop.typedef,
@@ -7366,6 +7454,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Lt)),
)
+_Lt.typedef.heaptype = True
_LtE.typedef = typedef.TypeDef("LtE",
cmpop.typedef,
@@ -7373,6 +7462,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_LtE)),
)
+_LtE.typedef.heaptype = True
_Gt.typedef = typedef.TypeDef("Gt",
cmpop.typedef,
@@ -7380,6 +7470,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Gt)),
)
+_Gt.typedef.heaptype = True
_GtE.typedef = typedef.TypeDef("GtE",
cmpop.typedef,
@@ -7387,6 +7478,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_GtE)),
)
+_GtE.typedef.heaptype = True
_Is.typedef = typedef.TypeDef("Is",
cmpop.typedef,
@@ -7394,6 +7486,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_Is)),
)
+_Is.typedef.heaptype = True
_IsNot.typedef = typedef.TypeDef("IsNot",
cmpop.typedef,
@@ -7401,6 +7494,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_IsNot)),
)
+_IsNot.typedef.heaptype = True
_In.typedef = typedef.TypeDef("In",
cmpop.typedef,
@@ -7408,6 +7502,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_In)),
)
+_In.typedef.heaptype = True
_NotIn.typedef = typedef.TypeDef("NotIn",
cmpop.typedef,
@@ -7415,6 +7510,7 @@
_fields=_FieldsWrapper([]),
__new__=interp2app(get_AST_new(_NotIn)),
)
+_NotIn.typedef.heaptype = True
def comprehension_get_target(space, w_self):
if w_self.w_dict is not None:
@@ -7522,6 +7618,7 @@
__new__=interp2app(get_AST_new(comprehension)),
__init__=interp2app(comprehension_init),
)
+comprehension.typedef.heaptype = True
def excepthandler_get_lineno(space, w_self):
if w_self.w_dict is not None:
@@ -7587,6 +7684,7 @@
col_offset=typedef.GetSetProperty(excepthandler_get_col_offset, excepthandler_set_col_offset, excepthandler_del_col_offset, cls=excepthandler),
__new__=interp2app(get_AST_new(excepthandler)),
)
+excepthandler.typedef.heaptype = True
def ExceptHandler_get_type(space, w_self):
if w_self.w_dict is not None:
@@ -7694,6 +7792,7 @@
__new__=interp2app(get_AST_new(ExceptHandler)),
__init__=interp2app(ExceptHandler_init),
)
+ExceptHandler.typedef.heaptype = True
def arguments_get_args(space, w_self):
if not w_self.initialization_state & 1:
@@ -7829,6 +7928,7 @@
__new__=interp2app(get_AST_new(arguments)),
__init__=interp2app(arguments_init),
)
+arguments.typedef.heaptype = True
def keyword_get_arg(space, w_self):
if w_self.w_dict is not None:
@@ -7911,6 +8011,7 @@
__new__=interp2app(get_AST_new(keyword)),
__init__=interp2app(keyword_init),
)
+keyword.typedef.heaptype = True
def alias_get_name(space, w_self):
if w_self.w_dict is not None:
@@ -7995,4 +8096,5 @@
__new__=interp2app(get_AST_new(alias)),
__init__=interp2app(alias_init),
)
-
+alias.typedef.heaptype = True
+
diff --git a/pypy/interpreter/astcompiler/tools/asdl_py.py b/pypy/interpreter/astcompiler/tools/asdl_py.py
--- a/pypy/interpreter/astcompiler/tools/asdl_py.py
+++ b/pypy/interpreter/astcompiler/tools/asdl_py.py
@@ -352,6 +352,7 @@
if needs_init:
self.emit("__init__=interp2app(%s_init)," % (name,), 1)
self.emit(")")
+ self.emit("%s.typedef.heaptype = True" % name)
self.emit("")
def make_init(self, name, fields):
@@ -669,10 +670,9 @@
for field, w_value in kwargs_w.iteritems():
space.setattr(w_self, space.wrap(field), w_value)
-AST.typedef = typedef.TypeDef("AST",
+AST.typedef = typedef.TypeDef("_ast.AST",
_fields=_FieldsWrapper([]),
_attributes=_FieldsWrapper([]),
- __module__='_ast',
__reduce__=interp2app(AST.reduce_w),
__setstate__=interp2app(AST.setstate_w),
__dict__ = typedef.GetSetProperty(typedef.descr_get_dict,
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -363,7 +363,7 @@
if fmt == 'R':
result = space.str_w(space.repr(value))
elif fmt == 'T':
- result = space.type(value).get_module_type_name()
+ result = space.type(value).name
elif fmt == 'N':
result = value.getname(space)
else:
@@ -404,7 +404,7 @@
%N - The result of w_arg.getname(space)
%R - The result of space.str_w(space.repr(w_arg))
- %T - The result of space.type(w_arg).get_module_type_name()
+ %T - The result of space.type(w_arg).name
"""
if not len(args):
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -22,6 +22,7 @@
else:
bases = [__base]
self.bases = bases
+ self.heaptype = False
self.hasdict = '__dict__' in rawdict
self.weakrefable = '__weakref__' in rawdict
self.doc = rawdict.pop('__doc__', None)
diff --git a/pypy/module/_ast/test/test_ast.py b/pypy/module/_ast/test/test_ast.py
--- a/pypy/module/_ast/test/test_ast.py
+++ b/pypy/module/_ast/test/test_ast.py
@@ -20,9 +20,9 @@
assert isinstance(ast.__version__, str)
def test_flags(self):
- skip("broken")
from copy_reg import _HEAPTYPE
- assert self.ast.Module.__flags__ & _HEAPTYPE
+ assert self.ast.AST.__flags__ & _HEAPTYPE == 0
+ assert self.ast.Module.__flags__ & _HEAPTYPE == _HEAPTYPE
def test_build_ast(self):
ast = self.ast
@@ -223,19 +223,19 @@
x = ast.Num()
assert x._fields == ('n',)
exc = raises(AttributeError, getattr, x, 'n')
- assert "Num' object has no attribute 'n'" in exc.value.args[0]
+ assert str(exc.value) == "'Num' object has no attribute 'n'"
x = ast.Num(42)
assert x.n == 42
exc = raises(AttributeError, getattr, x, 'lineno')
- assert "Num' object has no attribute 'lineno'" in exc.value.args[0]
+ assert str(exc.value) == "'Num' object has no attribute 'lineno'"
y = ast.Num()
x.lineno = y
assert x.lineno == y
exc = raises(AttributeError, getattr, x, 'foobar')
- assert "Num' object has no attribute 'foobar'" in exc.value.args[0]
+ assert str(exc.value) == "'Num' object has no attribute 'foobar'"
x = ast.Num(lineno=2)
assert x.lineno == 2
@@ -407,7 +407,7 @@
def test_issue1673_Num_fullinit(self):
import ast
- import copy
+ import copy
num_node = ast.Num(n=2,lineno=2,col_offset=3)
num_node2 = copy.deepcopy(num_node)
assert num_node.n == num_node2.n
diff --git a/pypy/module/_cffi_backend/cbuffer.py b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -56,8 +56,7 @@
raise
MiniBuffer.typedef = TypeDef(
- "buffer",
- __module__ = "_cffi_backend",
+ "_cffi_backend.buffer",
__len__ = interp2app(MiniBuffer.descr_len),
__getitem__ = interp2app(MiniBuffer.descr_getitem),
__setitem__ = interp2app(MiniBuffer.descr_setitem),
diff --git a/pypy/module/_cffi_backend/cdataobj.py b/pypy/module/_cffi_backend/cdataobj.py
--- a/pypy/module/_cffi_backend/cdataobj.py
+++ b/pypy/module/_cffi_backend/cdataobj.py
@@ -441,7 +441,7 @@
W_CData.typedef = TypeDef(
- 'CData',
+ '_cffi_backend.CData',
__module__ = '_cffi_backend',
__name__ = '<cdata>',
__repr__ = interp2app(W_CData.repr),
diff --git a/pypy/module/_cffi_backend/ctypearray.py b/pypy/module/_cffi_backend/ctypearray.py
--- a/pypy/module/_cffi_backend/ctypearray.py
+++ b/pypy/module/_cffi_backend/ctypearray.py
@@ -130,8 +130,7 @@
return self.ctitem.convert_to_object(result)
W_CDataIter.typedef = TypeDef(
- 'CDataIter',
- __module__ = '_cffi_backend',
+ '_cffi_backend.CDataIter',
__iter__ = interp2app(W_CDataIter.iter_w),
next = interp2app(W_CDataIter.next_w),
)
diff --git a/pypy/module/_cffi_backend/ctypeobj.py b/pypy/module/_cffi_backend/ctypeobj.py
--- a/pypy/module/_cffi_backend/ctypeobj.py
+++ b/pypy/module/_cffi_backend/ctypeobj.py
@@ -210,8 +210,7 @@
W_CType.typedef = TypeDef(
- 'CTypeDescr',
- __module__ = '_cffi_backend',
+ '_cffi_backend.CTypeDescr',
__repr__ = interp2app(W_CType.repr),
__weakref__ = make_weakref_descr(W_CType),
kind = GetSetProperty(W_CType.fget_kind, doc="kind"),
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
@@ -307,8 +307,7 @@
W_CField.typedef = TypeDef(
- 'CField',
- __module__ = '_cffi_backend',
+ '_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/_cffi_backend/libraryobj.py b/pypy/module/_cffi_backend/libraryobj.py
--- a/pypy/module/_cffi_backend/libraryobj.py
+++ b/pypy/module/_cffi_backend/libraryobj.py
@@ -85,8 +85,7 @@
W_Library.typedef = TypeDef(
- 'Library',
- __module__ = '_cffi_backend',
+ '_cffi_backend.Library',
__repr__ = interp2app(W_Library.repr),
load_function = interp2app(W_Library.load_function),
read_variable = interp2app(W_Library.read_variable),
diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py
--- a/pypy/module/_collections/interp_deque.py
+++ b/pypy/module/_collections/interp_deque.py
@@ -463,11 +463,10 @@
W_Deque.__init__(space.interp_w(W_Deque, w_self), space)
return w_self
-W_Deque.typedef = TypeDef("deque",
+W_Deque.typedef = TypeDef("collections.deque",
__doc__ = """deque(iterable[, maxlen]) --> deque object
Build an ordered collection accessible from endpoints only.""",
- __module__ = '_collections',
__new__ = interp2app(descr__new__),
__init__ = interp2app(W_Deque.init),
append = interp2app(W_Deque.append),
diff --git a/pypy/module/_collections/test/test_deque.py b/pypy/module/_collections/test/test_deque.py
--- a/pypy/module/_collections/test/test_deque.py
+++ b/pypy/module/_collections/test/test_deque.py
@@ -4,6 +4,8 @@
def test_basics(self):
from _collections import deque
+ assert deque.__module__ == 'collections'
+
d = deque(xrange(-5125, -5000))
d.__init__(xrange(200))
for i in xrange(200, 400):
diff --git a/pypy/module/_continuation/interp_continuation.py b/pypy/module/_continuation/interp_continuation.py
--- a/pypy/module/_continuation/interp_continuation.py
+++ b/pypy/module/_continuation/interp_continuation.py
@@ -136,8 +136,7 @@
W_Continulet.typedef = TypeDef(
- 'continulet',
- __module__ = '_continuation',
+ '_continuation.continulet',
__new__ = interp2app(W_Continulet___new__),
__init__ = interp2app(W_Continulet.descr_init),
switch = interp2app(W_Continulet.descr_switch),
diff --git a/pypy/module/_csv/interp_csv.py b/pypy/module/_csv/interp_csv.py
--- a/pypy/module/_csv/interp_csv.py
+++ b/pypy/module/_csv/interp_csv.py
@@ -154,8 +154,7 @@
W_Dialect.typedef = TypeDef(
- 'Dialect',
- __module__ = '_csv',
+ '_csv.Dialect',
__new__ = interp2app(W_Dialect___new__),
delimiter = interp_attrproperty('delimiter', W_Dialect),
diff --git a/pypy/module/_csv/interp_reader.py b/pypy/module/_csv/interp_reader.py
--- a/pypy/module/_csv/interp_reader.py
+++ b/pypy/module/_csv/interp_reader.py
@@ -245,8 +245,7 @@
return W_Reader(space, dialect, w_iter)
W_Reader.typedef = TypeDef(
- 'reader',
- __module__ = '_csv',
+ '_csv.reader',
dialect = interp_attrproperty_w('dialect', W_Reader),
line_num = interp_attrproperty('line_num', W_Reader),
__iter__ = interp2app(W_Reader.iter_w),
diff --git a/pypy/module/_csv/interp_writer.py b/pypy/module/_csv/interp_writer.py
--- a/pypy/module/_csv/interp_writer.py
+++ b/pypy/module/_csv/interp_writer.py
@@ -160,8 +160,7 @@
return W_Writer(space, dialect, w_fileobj)
W_Writer.typedef = TypeDef(
- 'writer',
- __module__ = '_csv',
+ '_csv.writer',
dialect = interp_attrproperty_w('dialect', W_Writer),
writerow = interp2app(W_Writer.writerow),
writerows = interp2app(W_Writer.writerows),
diff --git a/pypy/module/_io/interp_bufferedio.py b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -211,17 +211,16 @@
return space.call_method(self.w_raw, "isatty")
def repr_w(self, space):
- typename = space.type(self).getname(space)
- module = space.str_w(space.type(self).get_module())
+ typename = space.type(self).name
try:
w_name = space.getattr(self, space.wrap("name"))
except OperationError, e:
if not e.match(space, space.w_AttributeError):
raise
- return space.wrap("<%s.%s>" % (module, typename,))
+ return space.wrap("<%s>" % (typename,))
else:
name_repr = space.str_w(space.repr(w_name))
- return space.wrap("<%s.%s name=%s>" % (module, typename, name_repr))
+ return space.wrap("<%s name=%s>" % (typename, name_repr))
# ______________________________________________
@@ -844,10 +843,9 @@
self.state = STATE_OK
W_BufferedReader.typedef = TypeDef(
- 'BufferedReader', W_BufferedIOBase.typedef,
+ '_io.BufferedReader', W_BufferedIOBase.typedef,
__new__ = generic_new_descr(W_BufferedReader),
__init__ = interp2app(W_BufferedReader.descr_init),
- __module__ = "_io",
read = interp2app(W_BufferedReader.read_w),
peek = interp2app(W_BufferedReader.peek_w),
@@ -892,10 +890,9 @@
self.state = STATE_OK
W_BufferedWriter.typedef = TypeDef(
- 'BufferedWriter', W_BufferedIOBase.typedef,
+ '_io.BufferedWriter', W_BufferedIOBase.typedef,
__new__ = generic_new_descr(W_BufferedWriter),
__init__ = interp2app(W_BufferedWriter.descr_init),
- __module__ = "_io",
write = interp2app(W_BufferedWriter.write_w),
flush = interp2app(W_BufferedWriter.flush_w),
@@ -1015,10 +1012,9 @@
self.state = STATE_OK
W_BufferedRandom.typedef = TypeDef(
- 'BufferedRandom', W_BufferedIOBase.typedef,
+ '_io.BufferedRandom', W_BufferedIOBase.typedef,
__new__ = generic_new_descr(W_BufferedRandom),
__init__ = interp2app(W_BufferedRandom.descr_init),
- __module__ = "_io",
read = interp2app(W_BufferedRandom.read_w),
peek = interp2app(W_BufferedRandom.peek_w),
diff --git a/pypy/module/_io/interp_stringio.py b/pypy/module/_io/interp_stringio.py
--- a/pypy/module/_io/interp_stringio.py
+++ b/pypy/module/_io/interp_stringio.py
@@ -264,8 +264,7 @@
W_StringIO.typedef = TypeDef(
- 'StringIO', W_TextIOBase.typedef,
- __module__ = "_io",
+ '_io.StringIO', W_TextIOBase.typedef,
__new__ = generic_new_descr(W_StringIO),
__init__ = interp2app(W_StringIO.descr_init),
__getstate__ = interp2app(W_StringIO.descr_getstate),
diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -1015,11 +1015,10 @@
self.chunk_size = size
W_TextIOWrapper.typedef = TypeDef(
- 'TextIOWrapper', W_TextIOBase.typedef,
+ '_io.TextIOWrapper', W_TextIOBase.typedef,
__new__ = generic_new_descr(W_TextIOWrapper),
__init__ = interp2app(W_TextIOWrapper.descr_init),
__repr__ = interp2app(W_TextIOWrapper.descr_repr),
- __module__ = "_io",
next = interp2app(W_TextIOWrapper.next_w),
read = interp2app(W_TextIOWrapper.read_w),
diff --git a/pypy/module/_lsprof/interp_lsprof.py b/pypy/module/_lsprof/interp_lsprof.py
--- a/pypy/module/_lsprof/interp_lsprof.py
+++ b/pypy/module/_lsprof/interp_lsprof.py
@@ -199,7 +199,7 @@
if isinstance(w_type, W_TypeObject):
w_realclass, _ = space.lookup_in_type_where(w_type, name)
if isinstance(w_realclass, W_TypeObject):
- class_name = w_realclass.get_module_type_name()
+ class_name = w_realclass.name
else:
name = '?'
if class_name is None:
@@ -440,8 +440,7 @@
return space.wrap(p)
W_Profiler.typedef = TypeDef(
- 'Profiler',
- __module__ = '_lsprof',
+ '_lsprof.Profiler',
__new__ = interp2app(descr_new_profile),
enable = interp2app(W_Profiler.enable),
disable = interp2app(W_Profiler.disable),
diff --git a/pypy/module/_multibytecodec/interp_incremental.py b/pypy/module/_multibytecodec/interp_incremental.py
--- a/pypy/module/_multibytecodec/interp_incremental.py
+++ b/pypy/module/_multibytecodec/interp_incremental.py
@@ -75,7 +75,6 @@
MultibyteIncrementalDecoder.typedef = TypeDef(
'MultibyteIncrementalDecoder',
- __module__ = '_multibytecodec',
__new__ = interp2app(mbidecoder_new),
decode = interp2app(MultibyteIncrementalDecoder.decode_w),
reset = interp2app(MultibyteIncrementalDecoder.reset_w),
@@ -124,7 +123,6 @@
MultibyteIncrementalEncoder.typedef = TypeDef(
'MultibyteIncrementalEncoder',
- __module__ = '_multibytecodec',
__new__ = interp2app(mbiencoder_new),
encode = interp2app(MultibyteIncrementalEncoder.encode_w),
reset = interp2app(MultibyteIncrementalEncoder.reset_w),
diff --git a/pypy/module/_multibytecodec/interp_multibytecodec.py b/pypy/module/_multibytecodec/interp_multibytecodec.py
--- a/pypy/module/_multibytecodec/interp_multibytecodec.py
+++ b/pypy/module/_multibytecodec/interp_multibytecodec.py
@@ -46,7 +46,6 @@
MultibyteCodec.typedef = TypeDef(
'MultibyteCodec',
- __module__ = '_multibytecodec',
decode = interp2app(MultibyteCodec.decode),
encode = interp2app(MultibyteCodec.encode),
)
diff --git a/pypy/module/_multiprocessing/interp_connection.py b/pypy/module/_multiprocessing/interp_connection.py
--- a/pypy/module/_multiprocessing/interp_connection.py
+++ b/pypy/module/_multiprocessing/interp_connection.py
@@ -353,9 +353,8 @@
return bool(r)
W_FileConnection.typedef = TypeDef(
- 'Connection', W_BaseConnection.typedef,
+ '_multiprocessing.Connection', W_BaseConnection.typedef,
__new__ = interp2app(W_FileConnection.descr_new_file.im_func),
- __module__ = '_multiprocessing',
fileno = interp2app(W_FileConnection.fileno),
)
@@ -534,8 +533,7 @@
if sys.platform == 'win32':
W_PipeConnection.typedef = TypeDef(
- 'PipeConnection', W_BaseConnection.typedef,
+ '_multiprocessing.PipeConnection', W_BaseConnection.typedef,
__new__ = interp2app(W_PipeConnection.descr_new_pipe.im_func),
- __module__ = '_multiprocessing',
fileno = interp2app(W_PipeConnection.fileno),
)
diff --git a/pypy/module/_socket/interp_socket.py b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -600,8 +600,7 @@
method = getattr(W_RSocket, methodname + '_w')
socketmethods[methodname] = interp2app(method)
-W_RSocket.typedef = TypeDef("socket",
- __module__ = "_socket",
+W_RSocket.typedef = TypeDef("_socket.socket",
__doc__ = """\
socket([family[, type[, proto]]]) -> socket object
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -488,9 +488,8 @@
return space.wrap(s)
W_ArrayBase.typedef = TypeDef(
- 'array',
+ 'array.array',
__new__ = interp2app(w_array),
- __module__ = 'array',
__len__ = interp2app(W_ArrayBase.descr_len),
__eq__ = interp2app(W_ArrayBase.descr_eq),
diff --git a/pypy/module/cppyy/capi/loadable_capi.py b/pypy/module/cppyy/capi/loadable_capi.py
--- a/pypy/module/cppyy/capi/loadable_capi.py
+++ b/pypy/module/cppyy/capi/loadable_capi.py
@@ -21,10 +21,11 @@
class _Arg: # poor man's union
_immutable_ = True
- def __init__(self, l = 0, s = '', vp = rffi.cast(rffi.VOIDP, 0) ):
- self._long = l
+ def __init__(self, h = 0, l = -1, s = '', vp = rffi.cast(rffi.VOIDP, 0)):
+ self._handle = h
+ self._long = l
self._string = s
- self._voidp = vp
+ self._voidp = vp
# For the loadable CAPI, the calls start and end in RPython. Therefore, the standard
# _call of W_CTypeFunc, which expects wrapped objects, does not quite work: some
@@ -57,7 +58,7 @@
if isinstance(argtype, ctypeprim.W_CTypePrimitiveSigned):
misc.write_raw_signed_data(data, rffi.cast(rffi.LONG, obj._long), argtype.size)
elif isinstance(argtype, ctypeprim.W_CTypePrimitiveUnsigned):
- misc.write_raw_unsigned_data(data, rffi.cast(rffi.ULONG, obj._long), argtype.size)
+ misc.write_raw_unsigned_data(data, rffi.cast(rffi.ULONG, obj._handle), argtype.size)
elif obj._voidp != rffi.cast(rffi.VOIDP, 0):
data = rffi.cast(rffi.VOIDPP, data)
data[0] = obj._voidp
@@ -116,6 +117,8 @@
c_voidp = nt.new_pointer_type(space, c_void)
c_size_t = nt.new_primitive_type(space, 'size_t')
+ c_ptrdiff_t = nt.new_primitive_type(space, 'ptrdiff_t')
+
self.capi_call_ifaces = {
# name to opaque C++ scope representation
'num_scopes' : ([c_scope], c_int),
@@ -152,7 +155,7 @@
'get_methptr_getter' : ([c_scope, c_index], c_voidp), # TODO: verify
# handling of function argument buffer
- 'allocate_function_args' : ([c_size_t], c_voidp),
+ 'allocate_function_args' : ([c_int], c_voidp),
'deallocate_function_args' : ([c_voidp], c_void),
'function_arg_sizeof' : ([], c_size_t),
'function_arg_typeoffset' : ([], c_size_t),
@@ -169,7 +172,7 @@
'base_name' : ([c_type, c_int], c_ccharp),
'is_subtype' : ([c_type, c_type], c_int),
- 'base_offset' : ([c_type, c_type, c_object, c_int], c_long),
+ 'base_offset' : ([c_type, c_type, c_object, c_int], c_ptrdiff_t),
# method/function reflection information
'num_methods' : ([c_scope], c_int),
@@ -199,7 +202,7 @@
'num_datamembers' : ([c_scope], c_int),
'datamember_name' : ([c_scope, c_int], c_ccharp),
'datamember_type' : ([c_scope, c_int], c_ccharp),
- 'datamember_offset' : ([c_scope, c_int], c_size_t),
+ 'datamember_offset' : ([c_scope, c_int], c_ptrdiff_t),
'datamember_index' : ([c_scope, c_ccharp], c_int),
@@ -264,6 +267,9 @@
def _cdata_to_size_t(space, w_cdata):
return rffi.cast(rffi.SIZE_T, space.uint_w(w_cdata))
+def _cdata_to_ptrdiff_t(space, w_cdata):
+ return rffi.cast(rffi.LONG, space.int_w(w_cdata))
+
def _cdata_to_ptr(space, w_cdata): # TODO: this is both a hack and dreadfully slow
return rffi.cast(rffi.VOIDP,
space.interp_w(cdataobj.W_CData, w_cdata, can_be_None=False)._cdata)
@@ -273,9 +279,9 @@
# name to opaque C++ scope representation ------------------------------------
def c_num_scopes(space, cppscope):
- return space.int_w(call_capi(space, 'num_scopes', [_Arg(l=cppscope.handle)]))
+ return space.int_w(call_capi(space, 'num_scopes', [_Arg(h=cppscope.handle)]))
def c_scope_name(space, cppscope, iscope):
- args = [_Arg(l=cppscope.handle), _Arg(l=iscope)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=iscope)]
return charp2str_free(space, call_capi(space, 'scope_name', args))
def c_resolve_name(space, name):
@@ -285,62 +291,62 @@
def c_get_template(space, name):
return rffi.cast(C_TYPE, space.uint_w(call_capi(space, 'get_template', [_Arg(s=name)])))
def c_actual_class(space, cppclass, cppobj):
- args = [_Arg(l=cppclass.handle), _Arg(l=cppobj)]
+ args = [_Arg(h=cppclass.handle), _Arg(h=cppobj)]
return rffi.cast(C_TYPE, space.uint_w(call_capi(space, 'actual_class', args)))
# memory management ----------------------------------------------------------
def c_allocate(space, cppclass):
- return _cdata_to_cobject(space, call_capi(space, 'allocate', [_Arg(l=cppclass.handle)]))
+ return _cdata_to_cobject(space, call_capi(space, 'allocate', [_Arg(h=cppclass.handle)]))
def c_deallocate(space, cppclass, cppobject):
- call_capi(space, 'deallocate', [_Arg(l=cppclass.handle), _Arg(l=cppobject)])
+ call_capi(space, 'deallocate', [_Arg(h=cppclass.handle), _Arg(h=cppobject)])
def c_destruct(space, cppclass, cppobject):
- call_capi(space, 'destruct', [_Arg(l=cppclass.handle), _Arg(l=cppobject)])
+ call_capi(space, 'destruct', [_Arg(h=cppclass.handle), _Arg(h=cppobject)])
# method/function dispatching ------------------------------------------------
def c_call_v(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
call_capi(space, 'call_v', args)
def c_call_b(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.UCHAR, space.c_uint_w(call_capi(space, 'call_b', args)))
def c_call_c(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.CHAR, space.str_w(call_capi(space, 'call_c', args))[0])
def c_call_h(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.SHORT, space.int_w(call_capi(space, 'call_h', args)))
def c_call_i(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.INT, space.c_int_w(call_capi(space, 'call_i', args)))
def c_call_l(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.LONG, space.int_w(call_capi(space, 'call_l', args)))
def c_call_ll(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.LONGLONG, space.r_longlong_w(call_capi(space, 'call_ll', args)))
def c_call_f(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.FLOAT, r_singlefloat(space.float_w(call_capi(space, 'call_f', args))))
def c_call_d(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return rffi.cast(rffi.DOUBLE, space.float_w(call_capi(space, 'call_d', args)))
def c_call_r(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return _cdata_to_ptr(space, call_capi(space, 'call_r', args))
def c_call_s(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return call_capi(space, 'call_s', args)
def c_constructor(space, cppmethod, cppobject, nargs, cargs):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs)]
return _cdata_to_cobject(space, call_capi(space, 'constructor', args))
def c_call_o(space, cppmethod, cppobject, nargs, cargs, cppclass):
- args = [_Arg(l=cppmethod), _Arg(l=cppobject), _Arg(l=nargs), _Arg(vp=cargs), _Arg(l=cppclass.handle)]
+ args = [_Arg(h=cppmethod), _Arg(h=cppobject), _Arg(l=nargs), _Arg(vp=cargs), _Arg(h=cppclass.handle)]
return _cdata_to_cobject(space, call_capi(space, 'call_o', args))
def c_get_methptr_getter(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return rffi.cast(C_METHPTRGETTER_PTR,
_cdata_to_ptr(space, call_capi(space, 'get_methptr_getter', args)))
@@ -358,47 +364,47 @@
# scope reflection information -----------------------------------------------
def c_is_namespace(space, scope):
- return space.bool_w(call_capi(space, 'is_namespace', [_Arg(l=scope)]))
+ return space.bool_w(call_capi(space, 'is_namespace', [_Arg(h=scope)]))
def c_is_enum(space, name):
return space.bool_w(call_capi(space, 'is_enum', [_Arg(s=name)]))
# type/class reflection information ------------------------------------------
def c_final_name(space, cpptype):
- return charp2str_free(space, call_capi(space, 'final_name', [_Arg(l=cpptype)]))
+ return charp2str_free(space, call_capi(space, 'final_name', [_Arg(h=cpptype)]))
def c_scoped_final_name(space, cpptype):
- return charp2str_free(space, call_capi(space, 'scoped_final_name', [_Arg(l=cpptype)]))
+ return charp2str_free(space, call_capi(space, 'scoped_final_name', [_Arg(h=cpptype)]))
def c_has_complex_hierarchy(space, handle):
- return space.bool_w(call_capi(space, 'has_complex_hierarchy', [_Arg(l=handle)]))
+ return space.bool_w(call_capi(space, 'has_complex_hierarchy', [_Arg(h=handle)]))
def c_num_bases(space, cppclass):
- return space.int_w(call_capi(space, 'num_bases', [_Arg(l=cppclass.handle)]))
+ return space.int_w(call_capi(space, 'num_bases', [_Arg(h=cppclass.handle)]))
def c_base_name(space, cppclass, base_index):
- args = [_Arg(l=cppclass.handle), _Arg(l=base_index)]
+ args = [_Arg(h=cppclass.handle), _Arg(l=base_index)]
return charp2str_free(space, call_capi(space, 'base_name', args))
def c_is_subtype(space, derived, base):
jit.promote(base)
if derived == base:
return bool(1)
- return space.bool_w(call_capi(space, 'is_subtype', [_Arg(l=derived.handle), _Arg(l=base.handle)]))
+ return space.bool_w(call_capi(space, 'is_subtype', [_Arg(h=derived.handle), _Arg(h=base.handle)]))
def _c_base_offset(space, derived_h, base_h, address, direction):
- args = [_Arg(l=derived_h), _Arg(l=base_h), _Arg(l=address), _Arg(l=direction)]
- return _cdata_to_size_t(space, call_capi(space, 'base_offset', args))
+ args = [_Arg(h=derived_h), _Arg(h=base_h), _Arg(h=address), _Arg(l=direction)]
+ return _cdata_to_ptrdiff_t(space, call_capi(space, 'base_offset', args))
def c_base_offset(space, derived, base, address, direction):
if derived == base:
- return rffi.cast(rffi.SIZE_T, 0)
+ return rffi.cast(rffi.LONG, 0)
return _c_base_offset(space, derived.handle, base.handle, address, direction)
def c_base_offset1(space, derived_h, base, address, direction):
return _c_base_offset(space, derived_h, base.handle, address, direction)
# method/function reflection information -------------------------------------
def c_num_methods(space, cppscope):
- args = [_Arg(l=cppscope.handle)]
+ args = [_Arg(h=cppscope.handle)]
return space.int_w(call_capi(space, 'num_methods', args))
def c_method_index_at(space, cppscope, imethod):
- args = [_Arg(l=cppscope.handle), _Arg(l=imethod)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=imethod)]
return space.int_w(call_capi(space, 'method_index_at', args))
def c_method_indices_from_name(space, cppscope, name):
- args = [_Arg(l=cppscope.handle), _Arg(s=name)]
+ args = [_Arg(h=cppscope.handle), _Arg(s=name)]
indices = rffi.cast(C_INDEX_ARRAY,
_cdata_to_ptr(space, call_capi(space, 'method_indices_from_name', args)))
if not indices:
@@ -414,36 +420,36 @@
return py_indices
def c_method_name(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return charp2str_free(space, call_capi(space, 'method_name', args))
def c_method_result_type(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return charp2str_free(space, call_capi(space, 'method_result_type', args))
def c_method_num_args(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return space.int_w(call_capi(space, 'method_num_args', args))
def c_method_req_args(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return space.int_w(call_capi(space, 'method_req_args', args))
def c_method_arg_type(space, cppscope, index, arg_index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index), _Arg(l=arg_index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index), _Arg(l=arg_index)]
return charp2str_free(space, call_capi(space, 'method_arg_type', args))
def c_method_arg_default(space, cppscope, index, arg_index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index), _Arg(l=arg_index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index), _Arg(l=arg_index)]
return charp2str_free(space, call_capi(space, 'method_arg_default', args))
def c_method_signature(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return charp2str_free(space, call_capi(space, 'method_signature', args))
def c_method_is_template(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return space.bool_w(call_capi(space, 'method_is_template', args))
def _c_method_num_template_args(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return space.int_w(call_capi(space, 'method_num_template_args', args))
def c_template_args(space, cppscope, index):
nargs = _c_method_num_template_args(space, cppscope, index)
- arg1 = _Arg(l=cppscope.handle)
+ arg1 = _Arg(h=cppscope.handle)
arg2 = _Arg(l=index)
args = [c_resolve_name(space, charp2str_free(space,
call_capi(space, 'method_template_arg_name', [arg1, arg2, _Arg(l=iarg)]))
@@ -451,45 +457,45 @@
return args
def c_get_method(space, cppscope, index):
- args = [_Arg(l=cppscope.handle), _Arg(l=index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=index)]
return rffi.cast(C_METHOD, space.uint_w(call_capi(space, 'get_method', args)))
def c_get_global_operator(space, nss, lc, rc, op):
if nss is not None:
- args = [_Arg(l=nss.handle), _Arg(l=lc.handle), _Arg(l=rc.handle), _Arg(s=op)]
+ args = [_Arg(h=nss.handle), _Arg(h=lc.handle), _Arg(h=rc.handle), _Arg(s=op)]
return rffi.cast(WLAVC_INDEX, space.int_w(call_capi(space, 'get_global_operator', args)))
return rffi.cast(WLAVC_INDEX, -1)
# method properties ----------------------------------------------------------
def c_is_constructor(space, cppclass, index):
- args = [_Arg(l=cppclass.handle), _Arg(l=index)]
+ args = [_Arg(h=cppclass.handle), _Arg(l=index)]
return space.bool_w(call_capi(space, 'is_constructor', args))
def c_is_staticmethod(space, cppclass, index):
- args = [_Arg(l=cppclass.handle), _Arg(l=index)]
+ args = [_Arg(h=cppclass.handle), _Arg(l=index)]
return space.bool_w(call_capi(space, 'is_staticmethod', args))
# data member reflection information -----------------------------------------
def c_num_datamembers(space, cppscope):
- return space.int_w(call_capi(space, 'num_datamembers', [_Arg(l=cppscope.handle)]))
+ return space.int_w(call_capi(space, 'num_datamembers', [_Arg(h=cppscope.handle)]))
def c_datamember_name(space, cppscope, datamember_index):
- args = [_Arg(l=cppscope.handle), _Arg(l=datamember_index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=datamember_index)]
return charp2str_free(space, call_capi(space, 'datamember_name', args))
def c_datamember_type(space, cppscope, datamember_index):
- args = [_Arg(l=cppscope.handle), _Arg(l=datamember_index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=datamember_index)]
return charp2str_free(space, call_capi(space, 'datamember_type', args))
def c_datamember_offset(space, cppscope, datamember_index):
- args = [_Arg(l=cppscope.handle), _Arg(l=datamember_index)]
- return _cdata_to_size_t(space, call_capi(space, 'datamember_offset', args))
+ args = [_Arg(h=cppscope.handle), _Arg(l=datamember_index)]
+ return _cdata_to_ptrdiff_t(space, call_capi(space, 'datamember_offset', args))
def c_datamember_index(space, cppscope, name):
- args = [_Arg(l=cppscope.handle), _Arg(s=name)]
+ args = [_Arg(h=cppscope.handle), _Arg(s=name)]
return space.int_w(call_capi(space, 'datamember_index', args))
# data member properties -----------------------------------------------------
def c_is_publicdata(space, cppscope, datamember_index):
- args = [_Arg(l=cppscope.handle), _Arg(l=datamember_index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=datamember_index)]
return space.bool_w(call_capi(space, 'is_publicdata', args))
def c_is_staticdata(space, cppscope, datamember_index):
- args = [_Arg(l=cppscope.handle), _Arg(l=datamember_index)]
+ args = [_Arg(h=cppscope.handle), _Arg(l=datamember_index)]
return space.bool_w(call_capi(space, 'is_staticdata', args))
# misc helpers ---------------------------------------------------------------
@@ -509,7 +515,7 @@
def c_charp2stdstring(space, svalue):
return _cdata_to_cobject(space, call_capi(space, 'charp2stdstring', [_Arg(s=svalue)]))
def c_stdstring2stdstring(space, cppobject):
- return _cdata_to_cobject(space, call_capi(space, 'stdstring2stdstring', [_Arg(l=cppobject)]))
+ return _cdata_to_cobject(space, call_capi(space, 'stdstring2stdstring', [_Arg(h=cppobject)]))
# loadable-capi-specific pythonizations (none, as the capi isn't known until runtime)
def register_pythonizations(space):
diff --git a/pypy/module/cppyy/ffitypes.py b/pypy/module/cppyy/ffitypes.py
--- a/pypy/module/cppyy/ffitypes.py
+++ b/pypy/module/cppyy/ffitypes.py
@@ -102,7 +102,7 @@
_immutable_fields_ = ['libffitype', 'c_type', 'c_ptrtype']
libffitype = jit_libffi.types.slong
- c_type = rffi.LONG
+ c_type = rffi.LONG
c_ptrtype = rffi.LONGP
def _unwrap_object(self, space, w_obj):
diff --git a/pypy/module/cppyy/include/capi.h b/pypy/module/cppyy/include/capi.h
--- a/pypy/module/cppyy/include/capi.h
+++ b/pypy/module/cppyy/include/capi.h
@@ -48,7 +48,7 @@
cppyy_methptrgetter_t cppyy_get_methptr_getter(cppyy_scope_t scope, cppyy_index_t idx);
/* handling of function argument buffer ----------------------------------- */
- void* cppyy_allocate_function_args(size_t nargs);
+ void* cppyy_allocate_function_args(int nargs);
void cppyy_deallocate_function_args(void* args);
size_t cppyy_function_arg_sizeof();
size_t cppyy_function_arg_typeoffset();
@@ -66,7 +66,7 @@
int cppyy_is_subtype(cppyy_type_t derived, cppyy_type_t base);
/* calculate offsets between declared and actual type, up-cast: direction > 0; down-cast: direction < 0 */
- size_t cppyy_base_offset(cppyy_type_t derived, cppyy_type_t base, cppyy_object_t address, int direction);
+ ptrdiff_t cppyy_base_offset(cppyy_type_t derived, cppyy_type_t base, cppyy_object_t address, int direction);
/* method/function reflection information --------------------------------- */
int cppyy_num_methods(cppyy_scope_t scope);
@@ -97,7 +97,7 @@
int cppyy_num_datamembers(cppyy_scope_t scope);
char* cppyy_datamember_name(cppyy_scope_t scope, int datamember_index);
char* cppyy_datamember_type(cppyy_scope_t scope, int datamember_index);
- size_t cppyy_datamember_offset(cppyy_scope_t scope, int datamember_index);
+ ptrdiff_t cppyy_datamember_offset(cppyy_scope_t scope, int datamember_index);
int cppyy_datamember_index(cppyy_scope_t scope, const char* name);
diff --git a/pypy/module/cppyy/src/cintcwrapper.cxx b/pypy/module/cppyy/src/cintcwrapper.cxx
--- a/pypy/module/cppyy/src/cintcwrapper.cxx
+++ b/pypy/module/cppyy/src/cintcwrapper.cxx
@@ -520,12 +520,12 @@
/* handling of function argument buffer ----------------------------------- */
-void* cppyy_allocate_function_args(size_t nargs) {
+void* cppyy_allocate_function_args(int nargs) {
assert(sizeof(CPPYY_G__value) == sizeof(G__value));
G__param* libp = (G__param*)malloc(
offsetof(G__param, para) + nargs*sizeof(CPPYY_G__value));
libp->paran = (int)nargs;
- for (size_t i = 0; i < nargs; ++i)
+ for (int i = 0; i < nargs; ++i)
libp->para[i].type = 'l';
return (void*)libp->para;
}
@@ -613,7 +613,7 @@
return derived_type->GetBaseClass(base_type) != 0;
}
-size_t cppyy_base_offset(cppyy_type_t derived_handle, cppyy_type_t base_handle,
+ptrdiff_t cppyy_base_offset(cppyy_type_t derived_handle, cppyy_type_t base_handle,
cppyy_object_t address, int /* direction */) {
R__LOCKGUARD2(gCINTMutex);
@@ -642,7 +642,7 @@
}
}
- return (size_t) offset; // may be negative (will roll over)
+ return (ptrdiff_t) offset; // may be negative (will roll over)
}
@@ -941,16 +941,16 @@
return cppstring_to_cstring(gbl.GetFullTypeName());
}
-size_t cppyy_datamember_offset(cppyy_scope_t handle, int datamember_index) {
+ptrdiff_t cppyy_datamember_offset(cppyy_scope_t handle, int datamember_index) {
R__LOCKGUARD2(gCINTMutex);
TClassRef& cr = type_from_handle(handle);
if (cr.GetClass()) {
TDataMember* m = (TDataMember*)cr->GetListOfDataMembers()->At(datamember_index);
- return (size_t)m->GetOffsetCint();
+ return (ptrdiff_t)m->GetOffsetCint();
}
assert(handle == (cppyy_type_t)GLOBAL_HANDLE);
TGlobal& gbl = g_globalvars[datamember_index];
- return (size_t)gbl.GetAddress();
+ return (ptrdiff_t)gbl.GetAddress();
}
int cppyy_datamember_index(cppyy_scope_t handle, const char* name) {
diff --git a/pypy/module/cppyy/src/dummy_backend.cxx b/pypy/module/cppyy/src/dummy_backend.cxx
--- a/pypy/module/cppyy/src/dummy_backend.cxx
+++ b/pypy/module/cppyy/src/dummy_backend.cxx
@@ -50,12 +50,12 @@
struct Cppyy_PseudoDatambrInfo {
Cppyy_PseudoDatambrInfo(const std::string& name,
const std::string& type,
- size_t offset, bool isstatic) :
+ ptrdiff_t offset, bool isstatic) :
m_name(name), m_type(type), m_offset(offset), m_isstatic(isstatic) {}
std::string m_name;
std::string m_type;
- size_t m_offset;
+ ptrdiff_t m_offset;
bool m_isstatic;
};
@@ -120,7 +120,7 @@
#define PUBLIC_CPPYY_STATIC_DATA(dmname, dmtype) \
data.push_back(Cppyy_PseudoDatambrInfo("s_"#dmname, #dmtype, \
- (size_t)&dummy::cppyy_test_data::s_##dmname, true))
+ (ptrdiff_t)&dummy::cppyy_test_data::s_##dmname, true))
struct Cppyy_InitPseudoReflectionInfo {
@@ -765,9 +765,9 @@
/* handling of function argument buffer ----------------------------------- */
-void* cppyy_allocate_function_args(size_t nargs) {
+void* cppyy_allocate_function_args(int nargs) {
CPPYY_G__value* args = (CPPYY_G__value*)malloc(nargs*sizeof(CPPYY_G__value));
- for (size_t i = 0; i < nargs; ++i)
+ for (int i = 0; i < nargs; ++i)
args[i].type = 'l';
return (void*)args;
}
@@ -900,7 +900,7 @@
return cppstring_to_cstring(s_scopes[handle].m_datambrs[idatambr].m_type);
}
-size_t cppyy_datamember_offset(cppyy_scope_t handle, int idatambr) {
+ptrdiff_t cppyy_datamember_offset(cppyy_scope_t handle, int idatambr) {
return s_scopes[handle].m_datambrs[idatambr].m_offset;
}
diff --git a/pypy/module/cppyy/src/reflexcwrapper.cxx b/pypy/module/cppyy/src/reflexcwrapper.cxx
--- a/pypy/module/cppyy/src/reflexcwrapper.cxx
+++ b/pypy/module/cppyy/src/reflexcwrapper.cxx
@@ -212,9 +212,9 @@
/* handling of function argument buffer ----------------------------------- */
-void* cppyy_allocate_function_args(size_t nargs) {
+void* cppyy_allocate_function_args(int nargs) {
CPPYY_G__value* args = (CPPYY_G__value*)malloc(nargs*sizeof(CPPYY_G__value));
- for (size_t i = 0; i < nargs; ++i)
+ for (int i = 0; i < nargs; ++i)
args[i].type = 'l';
return (void*)args;
}
@@ -310,7 +310,7 @@
return (int)derived_type.HasBase(base_type);
}
-size_t cppyy_base_offset(cppyy_type_t derived_handle, cppyy_type_t base_handle,
+ptrdiff_t cppyy_base_offset(cppyy_type_t derived_handle, cppyy_type_t base_handle,
cppyy_object_t address, int direction) {
Reflex::Type derived_type = type_from_handle(derived_handle);
Reflex::Type base_type = type_from_handle(base_handle);
@@ -336,8 +336,8 @@
if (ibase->first.ToType() == base_type) {
long offset = (long)ibase->first.Offset((void*)address);
if (direction < 0)
- return (size_t) -offset; // note negative; rolls over
- return (size_t)offset;
+ return (ptrdiff_t) -offset; // note negative; rolls over
+ return (ptrdiff_t)offset;
}
}
@@ -561,12 +561,12 @@
return cppstring_to_cstring(name);
}
-size_t cppyy_datamember_offset(cppyy_scope_t handle, int datamember_index) {
+ptrdiff_t cppyy_datamember_offset(cppyy_scope_t handle, int datamember_index) {
Reflex::Scope s = scope_from_handle(handle);
Reflex::Member m = s.DataMemberAt(datamember_index);
if (m.IsArtificial() && m.TypeOf().IsEnum())
- return (size_t)&m.InterpreterOffset();
- return m.Offset();
+ return (ptrdiff_t)&m.InterpreterOffset();
+ return (ptrdiff_t)m.Offset();
}
int cppyy_datamember_index(cppyy_scope_t handle, const char* name) {
diff --git a/pypy/module/cppyy/test/test_datatypes.py b/pypy/module/cppyy/test/test_datatypes.py
--- a/pypy/module/cppyy/test/test_datatypes.py
+++ b/pypy/module/cppyy/test/test_datatypes.py
@@ -482,7 +482,7 @@
c = cppyy_test_data()
assert c.get_valid_string('aap') == 'aap'
- assert c.get_invalid_string() == ''
+ #assert c.get_invalid_string() == ''
def test13_copy_contructor(self):
"""Test copy constructor"""
diff --git a/pypy/module/cppyy/test/test_stltypes.py b/pypy/module/cppyy/test/test_stltypes.py
--- a/pypy/module/cppyy/test/test_stltypes.py
+++ b/pypy/module/cppyy/test/test_stltypes.py
@@ -265,8 +265,6 @@
std = cppyy.gbl.std
stringy_class = cppyy.gbl.stringy_class
- return
-
t0 = "aap\0noot"
self.assertEqual(t0, "aap\0noot")
diff --git a/pypy/module/cpyext/methodobject.py b/pypy/module/cpyext/methodobject.py
--- a/pypy/module/cpyext/methodobject.py
+++ b/pypy/module/cpyext/methodobject.py
@@ -6,6 +6,7 @@
from pypy.interpreter.gateway import interp2app
from pypy.interpreter.typedef import (
GetSetProperty, TypeDef, interp_attrproperty, interp_attrproperty_w)
+from pypy.objspace.std.typeobject import W_TypeObject
from pypy.module.cpyext.api import (
CONST_STRING, METH_CLASS, METH_COEXIST, METH_KEYWORDS, METH_NOARGS, METH_O,
METH_STATIC, METH_VARARGS, PyObject, PyObjectFields, bootstrap_function,
@@ -158,7 +159,9 @@
self.doc = doc
self.func = func
pyo = rffi.cast(PyObject, pto)
- self.w_objclass = from_ref(space, pyo)
+ w_type = from_ref(space, pyo)
+ assert isinstance(w_type, W_TypeObject)
+ self.w_objclass = w_type
def call(self, space, w_self, w_args, w_kw):
if self.wrapper_func is None:
@@ -174,7 +177,7 @@
def descr_method_repr(self):
return self.space.wrap("<slot wrapper '%s' of '%s' objects>" %
(self.method_name,
- self.w_objclass.getname(self.space)))
+ self.w_objclass.name))
def cwrapper_descr_call(space, w_self, __args__):
self = space.interp_w(W_PyCWrapperObject, w_self)
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -33,7 +33,7 @@
assert "copy" in repr(module.fooType.copy)
assert repr(module.fooType) == "<type 'foo.foo'>"
assert repr(obj2) == "<Foo>"
- assert repr(module.fooType.__call__) == "<slot wrapper '__call__' of 'foo' objects>"
+ assert repr(module.fooType.__call__) == "<slot wrapper '__call__' of 'foo.foo' objects>"
assert obj2(foo=1, bar=2) == dict(foo=1, bar=2)
print(obj.foo)
diff --git a/pypy/module/cpyext/test/test_version.py b/pypy/module/cpyext/test/test_version.py
--- a/pypy/module/cpyext/test/test_version.py
+++ b/pypy/module/cpyext/test/test_version.py
@@ -9,11 +9,17 @@
if (Py_IsInitialized()) {
PyObject *m = Py_InitModule("foo", NULL);
PyModule_AddStringConstant(m, "py_version", PY_VERSION);
+ PyModule_AddIntConstant(m, "py_major_version", PY_MAJOR_VERSION);
+ PyModule_AddIntConstant(m, "py_minor_version", PY_MINOR_VERSION);
+ PyModule_AddIntConstant(m, "py_micro_version", PY_MICRO_VERSION);
PyModule_AddStringConstant(m, "pypy_version", PYPY_VERSION);
}
"""
module = self.import_module(name='foo', init=init)
assert module.py_version == sys.version[:5]
+ assert module.py_major_version == sys.version_info.major
+ assert module.py_minor_version == sys.version_info.minor
+ assert module.py_micro_version == sys.version_info.micro
v = sys.pypy_version_info
s = '%d.%d.%d' % (v[0], v[1], v[2])
if v.releaselevel != 'final':
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -291,14 +291,9 @@
convert_getset_defs(space, dict_w, pto.c_tp_getset, self)
convert_member_defs(space, dict_w, pto.c_tp_members, self)
- full_name = rffi.charp2str(pto.c_tp_name)
- if '.' in full_name:
- module_name, extension_name = rsplit(full_name, ".", 1)
- dict_w["__module__"] = space.wrap(module_name)
- else:
- extension_name = full_name
+ name = rffi.charp2str(pto.c_tp_name)
- W_TypeObject.__init__(self, space, extension_name,
+ W_TypeObject.__init__(self, space, name,
bases_w or [space.w_object], dict_w)
if not space.is_true(space.issubtype(self, space.w_type)):
self.flag_cpytype = True
@@ -518,7 +513,7 @@
from pypy.module.cpyext.stringobject import PyString_AsString
pto.c_tp_name = PyString_AsString(space, heaptype.c_ht_name)
else:
- pto.c_tp_name = rffi.str2charp(w_type.getname(space))
+ pto.c_tp_name = rffi.str2charp(w_type.name)
pto.c_tp_basicsize = -1 # hopefully this makes malloc bail out
pto.c_tp_itemsize = 0
# uninitialized fields:
diff --git a/pypy/module/exceptions/interp_exceptions.py b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -207,9 +207,8 @@
return interp2app(descr_new_base_exception)
W_BaseException.typedef = TypeDef(
- 'BaseException',
+ 'exceptions.BaseException',
__doc__ = W_BaseException.__doc__,
- __module__ = 'exceptions',
__new__ = _new(W_BaseException),
__init__ = interp2app(W_BaseException.descr_init),
__str__ = interp2app(W_BaseException.descr_str),
@@ -244,10 +243,9 @@
for k, v in kwargs.items():
kwargs[k] = interp2app(v.__get__(None, realbase))
W_Exc.typedef = TypeDef(
- name,
+ 'exceptions.' + name,
base.typedef,
__doc__ = W_Exc.__doc__,
More information about the pypy-commit
mailing list