3K: BUG: alias divide -> true_divide correctly; just replacing the name in generate_umath.py is not the correct thing to do

pv · pv · commit cfc5c3bc0c7a · 2010-02-21T11:59:06.000Z
diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py
@@ -682,7 +682,8 @@ def english_upper(s):
 }
 
 if sys.version_info[0] >= 3:
-    defdict['divide'] = defdict['true_divide']
+    # Will be aliased to true_divide in umathmodule.c.src:InitOtherOperators
+    del defdict['divide']
 
 def indent(st,spaces):
     indention = ' '*spaces
diff --git a/numpy/core/src/umath/umathmodule.c.src b/numpy/core/src/umath/umathmodule.c.src
@@ -225,6 +225,12 @@ InitOtherOperators(PyObject *dictionary) {
                                 "Compute y = x1 * 2**x2.",0);
     PyDict_SetItemString(dictionary, "ldexp", f);
     Py_DECREF(f);
+
+#if defined(NPY_PY3K)
+    f = PyDict_GetItemString(dictionary, "true_divide");
+    PyDict_SetItemString(dictionary, "divide", f);
+    Py_DECREF(f);
+#endif
     return;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,8 @@ def english_upper(s):`
`682`	`682`	`}`
`683`	`683`
`684`	`684`	`if sys.version_info[0] >= 3:`
`685`		`- defdict['divide'] = defdict['true_divide']`
	`685`	`+ # Will be aliased to true_divide in umathmodule.c.src:InitOtherOperators`
	`686`	`+ del defdict['divide']`
`686`	`687`
`687`	`688`	`def indent(st,spaces):`
`688`	`689`	`indention = ' '*spaces`