Make import checks more explicit in %whos #910
Merged
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
Since PyPy has a fake numpy, checking for 'numpy' is insufficient only check if numpy/numeric in use, to prevent unnecessary imports closes ipythongh-904
|
Looks sensible. Do we actually still need to check for numeric? It's no longer even in Ubuntu/Debian repos, and the last binary installer is for Python 2.4. |
|
lol, good point. I think it's perfectly fine to drop support for pretty-printed Numeric arrays in |
|
Numeric removed |
| @@ -918,7 +914,7 @@ Currently the magic system has the following functions:\n""" | |||
| print vformat.format(vname, vtype, varwidth=varwidth, typewidth=typewidth), | |||
| if vtype in seq_types: | |||
| print "n="+str(len(var)) | |||
| elif vtype in [array_type,ndarray_type]: | |||
| elif vtype in [ndarray_type]: | |||
There was a problem hiding this comment.
This doesn't really need the in test now.
|
Other than that, it looks fine (I assume you've run it on PyPy) |
|
comment addressed. And yes, I have run it on pypy, and also in CPython with a dummy |
|
+1 from me. Guys, I'm really offline starting tomorrow, so go ahead without me on this one... |
minrk
added a commit
that referenced
this pull request
Oct 25, 2011
%whos no longer imports numpy unconditionally, and no longer supports Numeric. The import check explicitly looks for the ndarray object, rather than just numpy itself, which would fail in environments with broken numpy, such as PyPy. closes gh-904
mattvonrocketstein
pushed a commit
to mattvonrocketstein/ipython
that referenced
this pull request
Nov 3, 2014
%whos no longer imports numpy unconditionally, and no longer supports Numeric. The import check explicitly looks for the ndarray object, rather than just numpy itself, which would fail in environments with broken numpy, such as PyPy. closes ipythongh-904
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.
Since PyPy has a fake numpy, checking for 'import numpy' is insufficient
only check if numpy/numeric in use, to prevent unnecessary imports
%precisionhas a similar issue, but I'm actually inclined to let it raise (it doesn't crash, or anything, just shows that numpy is not really numpy).%whosis more important, and was entirely broken on PyPy.closes #904