diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:15:12 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:15:12 (GMT) |
| commit | bee325387b21b859054002a052149646399b52de (patch) | |
| tree | 76d4edea625f87c01c50e3ac4d63d5582107868c /Modules | |
| parent | d8b690f7ae57169d95f1cb4b3a0bccf5adfe6a30 (diff) | |
| download | cpython-bee325387b21b859054002a052149646399b52de.zip cpython-bee325387b21b859054002a052149646399b52de.tar.gz cpython-bee325387b21b859054002a052149646399b52de.tar.bz2 | |
Merged revisions 63361-63373,63375,63377-63380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63361 | alexandre.vassalotti | 2008-05-16 03:14:08 -0400 (Fri, 16 May 2008) | 2 lines
Rename the test file of reprlib.
........
r63364 | georg.brandl | 2008-05-16 05:34:48 -0400 (Fri, 16 May 2008) | 2 lines
Make generator repr consistent with function and code object repr.
........
r63365 | georg.brandl | 2008-05-16 05:47:29 -0400 (Fri, 16 May 2008) | 2 lines
#2869: remove parameter from signature.
........
r63366 | christian.heimes | 2008-05-16 06:23:31 -0400 (Fri, 16 May 2008) | 1 line
Fixed #2870: cmathmodule.c compile error
........
r63367 | christian.heimes | 2008-05-16 07:28:56 -0400 (Fri, 16 May 2008) | 1 line
Following Amaury's advice
........
r63368 | georg.brandl | 2008-05-16 09:10:15 -0400 (Fri, 16 May 2008) | 2 lines
#2890: support os.O_ASYNC and fcntl.FASYNC.
........
r63369 | georg.brandl | 2008-05-16 09:18:50 -0400 (Fri, 16 May 2008) | 2 lines
#2845: fix copy2's docs.
........
r63370 | georg.brandl | 2008-05-16 09:24:29 -0400 (Fri, 16 May 2008) | 2 lines
Don't allow keyword arguments to reversed().
........
r63373 | georg.brandl | 2008-05-16 09:41:26 -0400 (Fri, 16 May 2008) | 2 lines
Document O_ASYNC addition.
........
r63380 | georg.brandl | 2008-05-16 13:33:13 -0400 (Fri, 16 May 2008) | 2 lines
Fix reprlib docs.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/cmathmodule.c | 2 | ||||
| -rw-r--r-- | Modules/fcntlmodule.c | 3 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c index d6d1f27..109f2cc 100644 --- a/Modules/cmathmodule.c +++ b/Modules/cmathmodule.c @@ -920,7 +920,7 @@ cmath_phase(PyObject *self, PyObject *args) errno = 0; PyFPE_START_PROTECT("arg function", return 0) phi = c_atan2(z); - PyFPE_END_PROTECT(r) + PyFPE_END_PROTECT(phi) if (errno != 0) return math_error(); else diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index 6447e56..c5d41f2 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -510,6 +510,9 @@ all_ins(PyObject* d) if (ins(d, "F_SETLKW64", (long)F_SETLKW64)) return -1; #endif /* GNU extensions, as of glibc 2.2.4. */ +#ifdef FASYNC + if (ins(d, "FASYNC", (long)FASYNC)) return -1; +#endif #ifdef F_SETLEASE if (ins(d, "F_SETLEASE", (long)F_SETLEASE)) return -1; #endif diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 99efa56..33bcbd5 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -7212,6 +7212,11 @@ all_ins(PyObject *d) #endif /* GNU extensions. */ +#ifdef O_ASYNC + /* Send a SIGIO signal whenever input or output + becomes available on file descriptor */ + if (ins(d, "O_ASYNC", (long)O_ASYNC)) return -1; +#endif #ifdef O_DIRECT /* Direct disk access. */ if (ins(d, "O_DIRECT", (long)O_DIRECT)) return -1; |