Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 2.7.4 release branch

This commit is contained in:
Benjamin Peterson 2013-03-23 15:23:19 -05:00
parent cb800648ef 31289230e2
commit 6909ab5e8a
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Misc/NEWS
View File

@ -1,6 +1,17 @@
Python News 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 What's New in Python 2.7.4 release candidate 1
============================================== ==============================================

4
Modules/posixmodule.c
View File

@ -357,7 +357,7 @@ _PyInt_FromUid(uid_t uid)
{ {
if (uid <= LONG_MAX) if (uid <= LONG_MAX)
return PyInt_FromLong(uid); return PyInt_FromLong(uid);
return PyLong_FromUnsignedLong(uid); return PyInt_FromUnsignedLong(uid);
} }
PyObject * PyObject *
@ -365,7 +365,7 @@ _PyInt_FromGid(gid_t gid)
{ {
if (gid <= LONG_MAX) if (gid <= LONG_MAX)
return PyInt_FromLong(gid); return PyInt_FromLong(gid);
return PyLong_FromUnsignedLong(gid); return PyInt_FromUnsignedLong(gid);
} }
int int