upstream/ipython Commit - r3460:11e30b27

25

import re

25

import re

26

import time

26

import time

27

import textwrap

27

import textwrap

28

import types

29

from cStringIO import StringIO

28

from cStringIO import StringIO

30

from getopt import getopt,GetoptError

29

from getopt import getopt,GetoptError

31

from pprint import pformat

30

from pprint import pformat

834

833

835

- For {},[],(): their length.

834

- For {},[],(): their length.

836

835

837

- For numpy a~~nd Numeric a~~rrays, a summary with shape, number of

836

- For numpy arrays, a summary with shape, number of

838

elements, typecode and size in memory.

837

elements, typecode and size in memory.

839

838

840

- Everything else: a string representation, snipping their middle if

839

- Everything else: a string representation, snipping their middle if

867

# if we have variables, move on...

866

# if we have variables, move on...

868

867

869

# for these types, show len() instead of data:

868

# for these types, show len() instead of data:

870

seq_types = [~~types~~.~~DictType~~,~~types~~.~~ListType~~,~~types~~.~~TupleType~~]

869

seq_types = ['dict', 'list', 'tuple']

871

870

872

# for numpy/Numeric arrays, display summary info

871

# for numpy/Numeric arrays, display summary info

873

try:

872

try:

926

for vname,var,vtype in zip(varnames,varlist,typelist):

925

for vname,var,vtype in zip(varnames,varlist,typelist):

927

print itpl(vformat),

926

print itpl(vformat),

928

if vtype in seq_types:

927

if vtype in seq_types:

929

print len(var)

928

print "n="+str(len(var))

930

elif vtype in [array_type,ndarray_type]:

929

elif vtype in [array_type,ndarray_type]:

931

vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]

930

vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]

932

if vtype==ndarray_type:

931

if vtype==ndarray_type:

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             import re
             import time
             import textwrap
-            import types
             from cStringIO import StringIO
             from getopt import getopt,GetoptError
             from pprint import pformat
                       - For {},[],(): their length.
-                      - For numpy and Numeric arrays, a summary with shape, number of
+                      - For numpy arrays, a summary with shape, number of
                       elements, typecode and size in memory.
                       - Everything else: a string representation, snipping their middle if
                     # if we have variables, move on...
                     # for these types, show len() instead of data:
-                    seq_types = [types.DictType,types.ListType,types.TupleType]
+                    seq_types = ['dict', 'list', 'tuple']
                     # for numpy/Numeric arrays, display summary info
                     try:
                     for vname,var,vtype in zip(varnames,varlist,typelist):
                         print itpl(vformat),
                         if vtype in seq_types:
-                            print len(var)
+                            print "n="+str(len(var))
                         elif vtype in [array_type,ndarray_type]:
                             vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
                             if vtype==ndarray_type: