Author: Ronan Lamy <ronan.l...@gmail.com> Branch: py3k Changeset: r85975:1b2752361da5 Date: 2016-08-02 01:59 +0100 http://bitbucket.org/pypy/pypy/changeset/1b2752361da5/
Log: fix test_intlike() and more_init case in import_extension() diff --git a/pypy/module/cpyext/test/test_cpyext.py b/pypy/module/cpyext/test/test_cpyext.py --- a/pypy/module/cpyext/test/test_cpyext.py +++ b/pypy/module/cpyext/test/test_cpyext.py @@ -417,8 +417,7 @@ init = """PyObject *mod = PyModule_Create(&moduledef);""" if more_init: init += more_init - else: - init += "\nreturn mod;" + init += "\nreturn mod;" return import_module(space, name=modname, init=init, body=body, w_include_dirs=w_include_dirs, PY_SSIZE_T_CLEAN=PY_SSIZE_T_CLEAN) 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 @@ -779,7 +779,7 @@ """, more_init=""" IntLike_Type.tp_flags |= Py_TPFLAGS_DEFAULT; IntLike_Type.tp_as_number = &intlike_as_number; - intlike_as_number.nb_bool = intlike_nb_nonzero; + intlike_as_number.nb_bool = intlike_nb_bool; intlike_as_number.nb_int = intlike_nb_int; PyType_Ready(&IntLike_Type); """) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit