Backport 3324 #3490
Merged
Backport 3324 #3490
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ty__." This reverts commit aa7a047.
Conflicts: numpy/core/tests/test_multiarray.py
|
Numpy master no longer supports Python 2.4, but 1.7.x still does. According to travis, some Python >2.4-ism snuck in. (And unrelated thing: in the meantime, you can make the corresponding tests in scipy.sparse depend on Numpy version; use |
| @@ -2870,5 +2870,152 @@ def test_mem_seteventhook(self): | |||
| test_pydatamem_seteventhook_end() | |||
|
|
|||
|
|
|||
| class PriorityNdarray(): | |||
There was a problem hiding this comment.
Probably should be PriorityNdarray(object): for Py2.4
|
Thanks @pv I'll add that to the tests in sparse. |
|
I hadn't realized that the change was that intrusive. However, it seems to work so in it goes ;) Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backports the fix for having boolean comparisons respect array priority. (original PR).
I need this in 1.7.x for adding boolean comparisons to sparse matrices in SciPy. PR 1 PR 2. Otherwise, comparing a sparse matrix with a dense matrix fails when the dense matrix is on the LHS.