Merged the int/long unification branch, by very crude means (sorry Thomas!).
I banged on the code (beyond what's in that branch) to make fewer tests fail;
the only tests that fail now are:
test_descr -- can't pickle ints?!
test_pickletools -- ???
test_socket -- See python.org/sf/1619659
test_sqlite -- ???
I'll deal with those later.
diff --git a/Include/abstract.h b/Include/abstract.h
index 87b975d..1eab5f8 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -716,7 +716,7 @@
is cleared and the value is clipped.
*/
- PyAPI_FUNC(PyObject *) PyNumber_Int(PyObject *o);
+ #define PyNumber_Int PyNumber_Long
/*
Returns the o converted to an integer object on success, or