diff --git a/IPython/core/magic.py b/IPython/core/magic.py index 17ada3b..505f2e9 100644 --- a/IPython/core/magic.py +++ b/IPython/core/magic.py @@ -861,7 +861,7 @@ 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 + # for numpy arrays, display summary info ndarray_type = None if 'numpy' in sys.modules: try: @@ -871,15 +871,6 @@ Currently the magic system has the following functions:\n""" else: ndarray_type = ndarray.__name__ - array_type = None - if 'Numeric' in sys.modules: - try: - from Numeric import ArrayType - except ImportError: - pass - else: - array_type = ArrayType.__name__ - # Find all variable names and types so we can figure out column sizes def get_vars(i): return self.shell.user_ns[i] @@ -923,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 == ndarray_type: vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1] if vtype==ndarray_type: # numpy