[Python-checkins] r75496 - in python/branches/py3k/Python: compile.c formatter_unicode.c

[mark.dickinson]

Author: mark.dickinson
Date: Sun Oct 18 18:41:32 2009
New Revision: 75496

Log:
Remove the uses of WITHOUT_COMPLEX introduced in r75471

Modified:
   python/branches/py3k/Python/compile.c
   python/branches/py3k/Python/formatter_unicode.c

Modified: python/branches/py3k/Python/compile.c
==============================================================================
--- python/branches/py3k/Python/compile.c	(original)
+++ python/branches/py3k/Python/compile.c	Sun Oct 18 18:41:32 2009
@@ -911,7 +911,6 @@
 		else
 			t = PyTuple_Pack(2, o, o->ob_type);
 	}
-#ifndef WITHOUT_COMPLEX
 	else if (PyComplex_Check(o)) {
 		Py_complex z;
 		int real_part_zero, imag_part_zero;
@@ -945,7 +944,6 @@
 			t = PyTuple_Pack(2, o, o->ob_type);
 		}
         }
-#endif /* WITHOUT_COMPLEX */
 	else {
 		t = PyTuple_Pack(2, o, o->ob_type);
         }

Modified: python/branches/py3k/Python/formatter_unicode.c
==============================================================================
--- python/branches/py3k/Python/formatter_unicode.c	(original)
+++ python/branches/py3k/Python/formatter_unicode.c	Sun Oct 18 18:41:32 2009
@@ -9,8 +9,6 @@
 #define FORMAT_STRING  _PyUnicode_FormatAdvanced
 #define FORMAT_LONG    _PyLong_FormatAdvanced
 #define FORMAT_FLOAT   _PyFloat_FormatAdvanced
-#ifndef WITHOUT_COMPLEX
 #define FORMAT_COMPLEX _PyComplex_FormatAdvanced
-#endif
 
 #include "../Objects/stringlib/formatter.h"