[Python-checkins] r72486 - in python/branches/release30-maint: Modules/resource.c

mark.dickinson python-checkins at python.org
Fri May 8 23:29:32 CEST 2009


Author: mark.dickinson
Date: Fri May  8 23:29:32 2009
New Revision: 72486

Log:
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.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Modules/resource.c

Modified: python/branches/release30-maint/Modules/resource.c
==============================================================================
--- python/branches/release30-maint/Modules/resource.c	(original)
+++ python/branches/release30-maint/Modules/resource.c	Fri May  8 23:29:32 2009
@@ -166,12 +166,10 @@
 	    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


More information about the Python-checkins mailing list