merge 2.7.4 branch

This commit is contained in:
Benjamin Peterson 2013-03-23 15:35:38 -05:00
commit e48b2c29bd

View file

@ -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