return int instead long when possible (#17531)

diff --git a/Misc/NEWS b/Misc/NEWS
index b8dc1f22e8816ecea2e29251d21886f42183863a..cfa3f64d6b345c38561d796d26e36dfe2a7361ba 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,6 +1,17 @@
 Python News
 +++++++++++
 
+What's New in Python 2.7.4?
+===========================
+
+*Release date: XXXX-XX-XX*
+
+Library
+-------
+
+- Issue #17531: Return group and user ids as int instead long when possible.
+
+
 What's New in Python 2.7.4 release candidate 1
 ==============================================
 

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index a06ebd10a3fed7f766b0c700e8eeb69873456228..00decc3982e3eeab6d8a695890e32245728acfa5 100644 (file)
--- 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 PyLong_FromUnsignedLong(uid);
+    return PyInt_FromUnsignedLong(uid);
 }
 
 PyObject *
@@ -365,7 +365,7 @@ _PyInt_FromGid(gid_t gid)
 {
     if (gid <= LONG_MAX)
         return PyInt_FromLong(gid);
-    return PyLong_FromUnsignedLong(gid);
+    return PyInt_FromUnsignedLong(gid);
 }
 
 int