<br><br><div class="gmail_quote">On Thu, Jun 11, 2009 at 10:29 AM, Travis Oliphant <span dir="ltr"><<a href="mailto:oliphant@enthought.com">oliphant@enthought.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div style=""><br><div><div><div></div><div class="h5"><div>On Jun 10, 2009, at 11:18 PM, Charles R Harris wrote:</div><br><blockquote type="cite">Hi Travis,<br><br>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:<br>
<br><pre style="display: block; font-family: courier new,monospace;">@@ -2688,10 +2690,8 @@<br> goto err;<br> }<br>- /*<br>- * PyExc_Exception should catch all the standard errors that are<br>- * now raised instead of the string exception "multiarray.error".<br>
- * This is for backward compatibility with existing code.<br>- */<br>- PyDict_SetItemString (d, "error", PyExc_Exception);<br>+ /* Fixme: we might want to remove this old string exception string */<br>
+ s = PyString_FromString("multiarray.error");<br>+ PyDict_SetItemString (d, "error", s);<br>+ Py_DECREF(s);<br> s = PyString_FromString("3.0");<br> PyDict_SetItemString(d, "__version__", s);</pre>
And I am concerned that there might be other such cases.</blockquote><div><br></div></div></div>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. </div>
<div><br></div><div>Thanks for checking. I don't want to stomp on your work, but I don't know what you mean by cleaning up arraytypes? </div><div></div></div></blockquote><div><br>Reorganize a bit, break the long repeat lines, more prominent labels, c style, that sort of thing. I got most of the c style cleanups done before the 1.3 release but didn't quite finish all the files that are now broken up in multiarray.<br>
<br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div style=""><div><br></div><div>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). </div>
<div></div></div></blockquote><div><br>Cleaning up the functions associated with the descriptor handling is on my list somewhere, but not near the top at the moment. Too much work ;)<br> <br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div style=""><div><br></div><div>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. </div><div></div></div></blockquote><div><br>The API is going to be bumped in any case and it may be that now is the time to add in any ABI changes.<br>
<br>Chuck <br></div><br></div><br>