Return `long' objects when `int' is requested but the value won't fit.

Mostly, Python handles the error from the `int' conversion and falls
back to long, but there's something weird in iteration, where if you say

	for i in ...:
	  print '%d' % x

then the loop finishes and /then/ you get an exception for the overflow
from the failed conversion of x to an `int'.

Follow Python's actual behaviour: have `mp_tolong_checked' take an extra
argument indicating whether to throw an exception, and modify most of
the call sites to fall back to a conversion based on `mp_topylong'.

diff --git a/catacomb-python.h b/catacomb-python.h
index f1e6365cc66d8b613033d56077d5e5cba4212b99..8f8da9ddf9b922d3543291e3385a589938d1fd81 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -321,7 +321,7 @@ extern PyObject *gf_pywrap(mp *);
 extern mp *mp_frompyobject(PyObject *, int);
 extern PyObject *mp_topystring(mp *, int,
                               const char *, const char *, const char *);
 extern mp *mp_frompyobject(PyObject *, int);
 extern PyObject *mp_topystring(mp *, int,
                               const char *, const char *, const char *);

-extern int mp_tolong_checked(mp *, long *);
+extern int mp_tolong_checked(mp *, long *, int);

 
 /*----- Abstract fields ---------------------------------------------------*/
 
 
 /*----- Abstract fields ---------------------------------------------------*/