Fix tests after NumPy changes.

PullRequest: graalpython-open/54

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/longobject.c

@@ -52,7 +52,7 @@ long PyLong_AsLongAndOverflow(PyObject *obj, int *overflow) {
         return -1;
     }
     long result = truffle_invoke_l(PY_TRUFFLE_CEXT, "PyLong_AsPrimitive", to_java(obj), true, sizeof(long), truffle_read_string("long"));
-    *overflow = result == -1L && PyErr_Occurred();
+    *overflow = result == -1L && PyErr_Occurred() != NULL;
     return result;
 }
 
@@ -93,8 +93,13 @@ PyObject * PyLong_FromVoidPtr(void *p) {
 void * PyLong_AsVoidPtr(PyObject *obj){
 	return (void *)PyLong_AsSsize_t(obj);
 }
+
 PyObject * PyLong_FromLong(long n)  {
-	return PyLong_FromUnsignedLongLong(n);
+    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_FromLongLong", n, true);
+    if (result == ERROR_MARKER) {
+    	return NULL;
+    }
+    return to_sulong(result);
 }
 
 PyObject * PyLong_FromLongLong(long long n)  {

graalpython/com.oracle.graal.python.cext/src/object.c

@@ -407,17 +407,18 @@ int PyType_Ready(PyTypeObject* cls) {
         // TODO ...
     }
 
+    // TODO link subclasses
     /* Link into each base class's list of subclasses */
     bases = cls->tp_bases;
-    Py_ssize_t n = PyTuple_GET_SIZE(bases);
-    Py_ssize_t i;
-    for (i = 0; i < n; i++) {
-        PyTypeObject *b = polyglot_as__typeobject(PyTuple_GET_ITEM(bases, i));
-        if (PyType_Check(b) && add_subclass((PyTypeObject *)b, cls) < 0) {
-        	cls->tp_flags &= ~Py_TPFLAGS_READYING;
-        	return -1;
-        }
-    }
+//    Py_ssize_t n = PyTuple_GET_SIZE(bases);
+//    Py_ssize_t i;
+//    for (i = 0; i < n; i++) {
+//        PyTypeObject *b = polyglot_as__typeobject(PyTuple_GetItem(bases, i));
+//        if (PyType_Check(b) && add_subclass((PyTypeObject *)b, cls) < 0) {
+//        	cls->tp_flags &= ~Py_TPFLAGS_READYING;
+//        	return -1;
+//        }
+//    }
 
     // done
     cls->tp_flags = cls->tp_flags & ~Py_TPFLAGS_READYING;

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_capsule.py

@@ -56,7 +56,7 @@ def compile_module(self, name):
         ''',
         resultspec="i",
         argspec='sn',
-        arguments=["PyObject* name", "Py_ssize_t ptr"],
+        arguments=["char* name", "Py_ssize_t ptr"],
         callfunction="wrap_PyCapsule_Check",
         cmpfunc=unhandled_error_compare
     )

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java

@@ -83,6 +83,7 @@ public Object clear(PFrame self, int idx) {
     @GenerateNodeFactory
     public abstract static class TruffleGetClassScopeNode extends PythonBuiltinNode {
         @Specialization
+        @TruffleBoundary
         public Object add(PFrame self) {
             // TODO: remove me
             // TODO: do it properly via the python API in super.__init__ :