Remove the uses of WITHOUT_COMPLEX introduced in r75471

mdickinson · mdickinson · commit 01458c7a62cb · 2009-10-18T16:41:32.000Z
diff --git a/Python/compile.c b/Python/compile.c
@@ -911,7 +911,6 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
 		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 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
 			t = PyTuple_Pack(2, o, o->ob_type);
 		}
         }
-#endif /* WITHOUT_COMPLEX */
 	else {
 		t = PyTuple_Pack(2, o, o->ob_type);
         }
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,6 @@ compiler_add_o(struct compiler c, PyObject dict, PyObject *o)`
`911`	`911`	`else`
`912`	`912`	`t = PyTuple_Pack(2, o, o->ob_type);`
`913`	`913`	`}`
`914`		`-#ifndef WITHOUT_COMPLEX`
`915`	`914`	`else if (PyComplex_Check(o)) {`
`916`	`915`	`Py_complex z;`
`917`	`916`	`int real_part_zero, imag_part_zero;`
`@@ -945,7 +944,6 @@ compiler_add_o(struct compiler c, PyObject dict, PyObject *o)`
`945`	`944`	`t = PyTuple_Pack(2, o, o->ob_type);`
`946`	`945`	`}`
`947`	`946`	`}`
`948`		`-#endif /* WITHOUT_COMPLEX */`
`949`	`947`	`else {`
`950`	`948`	`t = PyTuple_Pack(2, o, o->ob_type);`
`951`	`949`	`}`