merge 2.7.4 branch

e48b2c29 · Benjamin Peterson · aec81399 · 4d7fc3c5 · e48b2c29
Commit e48b2c29 authored Mar 23, 2013 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Modules/posixmodule.c Modules/posixmodule.c +2 -2

No files found.
--- 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