summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-03-23 20:35:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-03-23 20:35:38 (GMT)
commite48b2c29bdff8f5c5fd6d160db6fa4eb417c833c (patch)
treea5e6cfa5dc27ab93535535e14c872f151bfb38f3
parentaec813993f2e8fe3c07549073c57432231c8dd04 (diff)
parent4d7fc3c5ac0d09a83a02cc35788ea1b806866ad9 (diff)
downloadcpython-e48b2c29bdff8f5c5fd6d160db6fa4eb417c833c.zip
cpython-e48b2c29bdff8f5c5fd6d160db6fa4eb417c833c.tar.gz
cpython-e48b2c29bdff8f5c5fd6d160db6fa4eb417c833c.tar.bz2
merge 2.7.4 branch
-rw-r--r--Modules/posixmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 00decc3..a06ebd1 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -357,7 +357,7 @@ _PyInt_FromUid(uid_t uid)
{
if (uid <= LONG_MAX)
return PyInt_FromLong(uid);
- return PyInt_FromUnsignedLong(uid);
+ return PyLong_FromUnsignedLong(uid);
}
PyObject *
@@ -365,7 +365,7 @@ _PyInt_FromGid(gid_t gid)
{
if (gid <= LONG_MAX)
return PyInt_FromLong(gid);
- return PyInt_FromUnsignedLong(gid);
+ return PyLong_FromUnsignedLong(gid);
}
int