diff --git a/IPython/Magic.py b/IPython/Magic.py index a5c5f95..c844276 100644 --- a/IPython/Magic.py +++ b/IPython/Magic.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Magic functions for InteractiveShell. -$Id: Magic.py 969 2005-12-29 17:18:31Z fperez $""" +$Id: Magic.py 970 2005-12-29 18:22:53Z fperez $""" #***************************************************************************** # Copyright (C) 2001 Janko Hauser and @@ -2555,7 +2555,7 @@ Defaulting color scheme to 'NoColor'""" Note also that the variables will need to be pickleable; most basic python types can be safely %stored. """ - + opts,args = self.parse_options(parameter_s,'dr',mode='list') # delete if opts.has_key('d'): @@ -2573,33 +2573,30 @@ Defaulting color scheme to 'NoColor'""" for k in self.shell.persist.keys(): if k.startswith('S:'): del self.shell.persist[k] - + # run without arguments -> list variables & values elif not args: - vars = [v[2:] for v in self.shell.persist.keys() if v.startswith('S:')] + vars = [v[2:] for v in self.shell.persist.keys() + if v.startswith('S:')] vars.sort() if vars: size = max(map(len,vars)) else: size = 0 - fmt = '%-'+str(size)+'s -> %s' print 'Stored variables and their in-memory values:' + fmt = '%-'+str(size)+'s -> %s' + get = self.shell.user_ns.get for var in vars: # print 30 first characters from every var - print fmt % (var,repr(self.shell.user_ns.get(var, ''))[:50]) + print fmt % (var,repr(get(var,''))[:50]) # default action - store the variable else: pickled = pickle.dumps(self.shell.user_ns[args[0] ]) self.shell.persist[ 'S:' + args[0] ] = pickled print "Stored '%s' (%d bytes)" % (args[0], len(pickled)) - - - - - - + def magic_bookmark(self, parameter_s=''): """Manage IPython's bookmark system.