diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-03-23 20:23:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-03-23 20:23:19 (GMT) |
| commit | 6909ab5e8a2d0ddaea2c5e0c95f72136ad8b323d (patch) | |
| tree | 2ab7e06d010505c1a19b62c5251d0be637be2195 | |
| parent | cb800648ef49386f1560af6555c2e5f47c405372 (diff) | |
| parent | 31289230e2244c1cd0483547e2a4c60c79cfab9d (diff) | |
| download | cpython-6909ab5e8a2d0ddaea2c5e0c95f72136ad8b323d.zip cpython-6909ab5e8a2d0ddaea2c5e0c95f72136ad8b323d.tar.gz cpython-6909ab5e8a2d0ddaea2c5e0c95f72136ad8b323d.tar.bz2 | |
merge 2.7.4 release branch
| -rw-r--r-- | Misc/NEWS | 11 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 4 |
2 files changed, 13 insertions, 2 deletions
@@ -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 a06ebd1..00decc3 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 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 |