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/Objects/intobject.c b/Objects/intobject.c
index 0b746de..256824c 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -10,6 +10,7 @@
return LONG_MAX; /* To initialize sys.maxint */
}
+#if 0
/* Integers are quite normal objects, to make object handling uniform.
(Using odd pointers to represent integers would save much space
but require extra checks for this special case throughout the code.)
@@ -1254,3 +1255,4 @@
}
}
}
+#endif /* if 0 */