From: Mark Dickinson <dickinsm@gmail.com>
Date: Fri, 8 May 2009 21:29:32 +0000 (+0000)
Subject: Merged revisions 72485 via svnmerge from
X-Git-Tag: 3.0~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14c78d0cdeb127424ba3a197941a45bebf954a96;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 72485 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r72485 | mark.dickinson | 2009-05-08 22:28:46 +0100 (Fri, 08 May 2009) | 2 lines

  Clean up some int/long detection remnants in resource module.
........
---

diff --git a/Modules/resource.c b/Modules/resource.c
index facb7d958deb..22e177fe38fe 100644
--- a/Modules/resource.c
+++ b/Modules/resource.c
@@ -166,12 +166,10 @@ resource_setrlimit(PyObject *self, PyObject *args)
 	    return NULL;
 #else
 	/* The limits are probably bigger than a long */
-	rl.rlim_cur = PyLong_Check(curobj) ?
-		PyLong_AsLongLong(curobj) : PyLong_AsLong(curobj);
+	rl.rlim_cur = PyLong_AsLongLong(curobj);
 	if (rl.rlim_cur == (rlim_t)-1 && PyErr_Occurred())
 	    return NULL;
-	rl.rlim_max = PyLong_Check(maxobj) ?
-		PyLong_AsLongLong(maxobj) : PyLong_AsLong(maxobj);
+	rl.rlim_max = PyLong_AsLongLong(maxobj);
 	if (rl.rlim_max == (rlim_t)-1 && PyErr_Occurred())
 	    return NULL;
 #endif