Merge pull request #910 from minrk/pypynumpy

%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

IPython/core/magic.py

@@ -861,19 +861,15 b' Currently the magic system has the following functions:\\n"""'
         # for these types, show len() instead of data:
         seq_types = ['dict', 'list', 'tuple']
 
-        # for numpy/Numeric arrays, display summary info
-        try:
-            import numpy
-        except ImportError:
+        # for numpy arrays, display summary info
             ndarray_type = None
-        else:
-            ndarray_type = numpy.ndarray.__name__
+        if 'numpy' in sys.modules:
         try:
-            import Numeric
+                from numpy import ndarray
         except ImportError:
-            array_type = None
+                pass
         else:
-            array_type = Numeric.ArrayType.__name__
+                ndarray_type = ndarray.__name__
 
         # Find all variable names and types so we can figure out column sizes
         def get_vars(i):
@@ -918,7 +914,7 b' 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 == ndarray_type:
                 vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
                 if vtype==ndarray_type:
                     # numpy