On Jun 10, 2009, at 11:18 PM, Charles R Harris wrote:

Hi Travis,

I looked through the recent commits to the datetime branch and, as I'm working on cleaning up arraytypes I would appreciate it if you can merge up your changes there as soon as possible to minimize conflicts. Also, this change looks like a reversion of current trunk to something older:

@@ -2688,10 +2690,8 @@
         goto err;
     }
-    /*
-     * PyExc_Exception should catch all the standard errors that are
-     * now raised instead of the string exception "multiarray.error".

-     * This is for backward compatibility with existing code.
-     */
-    PyDict_SetItemString (d, "error", PyExc_Exception);
+ /* Fixme: we might want to remove this old string exception string */

+    s = PyString_FromString("multiarray.error");
+    PyDict_SetItemString (d, "error", s);
+    Py_DECREF(s);
     s = PyString_FromString("3.0");
     PyDict_SetItemString(d, "__version__", s);
And I am concerned that there might be other such cases.

There may be. I took Robert's git branch and tried to re-base it. But, I'm a git neophyte and didn't know what I was doing. I tried to eliminate the most obvious cases where is trunk was out-of-date, but obviously missed some.

Thanks for checking. I don't want to stomp on your work, but I don't know what you mean by cleaning up arraytypes?

I am hoping to get the datetime changes merged to trunk by the end of the month. There are a couple of potential issues that may slow that down because of the change to the PyArray_Descr structure (we need to add a metadata object at the end).

We may need to bump up the version number of NumPy to encourage C- extensions to re-compile, but I think it will work without that.

-Travis

_______________________________________________
Numpy-discussion mailing list
[email protected]
http://mail.scipy.org/mailman/listinfo/numpy-discussion

Reply via email to