From 327858ef2c4512937a1333212a3b46a62c18ccc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 4 Dec 2007 22:18:27 +0000 Subject: [PATCH] Eliminate outdated usages of PyInt_GetMax. --- Doc/c-api/utilities.rst | 6 ++---- Python/modsupport.c | 10 ++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Doc/c-api/utilities.rst b/Doc/c-api/utilities.rst index 0a922304678..e3533f09089 100644 --- a/Doc/c-api/utilities.rst +++ b/Doc/c-api/utilities.rst @@ -901,12 +901,10 @@ return true, otherwise they return false and raise an appropriate exception. Convert a C :ctype:`unsigned short int` to a Python integer object. ``I`` (integer/long) [unsigned int] - Convert a C :ctype:`unsigned int` to a Python integer object or a Python long - integer object, if it is larger than ``sys.maxint``. + Convert a C :ctype:`unsigned int` to a Python long integer object. ``k`` (integer/long) [unsigned long] - Convert a C :ctype:`unsigned long` to a Python integer object or a Python long - integer object, if it is larger than ``sys.maxint``. + Convert a C :ctype:`unsigned long` to a Python long integer object. ``L`` (long) [PY_LONG_LONG] Convert a C :ctype:`long long` to a Python integer object. Only available diff --git a/Python/modsupport.c b/Python/modsupport.c index aca57a4b000..68e1fa4a6af 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -316,10 +316,7 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) { unsigned int n; n = va_arg(*p_va, unsigned int); - if (n > (unsigned long)PyInt_GetMax()) - return PyLong_FromUnsignedLong((unsigned long)n); - else - return PyLong_FromLong(n); + return PyLong_FromUnsignedLong(n); } case 'n': @@ -334,10 +331,7 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) { unsigned long n; n = va_arg(*p_va, unsigned long); - if (n > (unsigned long)PyInt_GetMax()) - return PyLong_FromUnsignedLong(n); - else - return PyLong_FromLong(n); + return PyLong_FromUnsignedLong(n); } #ifdef HAVE_LONG_LONG