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. ........

--- a/Modules/cmathmodule.c	Fri May 16 17:28:50 2008 +0000
+++ b/Modules/cmathmodule.c	Fri May 16 18:15:12 2008 +0000
@@ -920,7 +920,7 @@
 	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