Show More
@@ -1,7 +1,7 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Magic functions for InteractiveShell. |
|
2 | """Magic functions for InteractiveShell. | |
3 |
|
3 | |||
4 |
$Id: Magic.py 9 |
|
4 | $Id: Magic.py 970 2005-12-29 18:22:53Z fperez $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
@@ -2555,7 +2555,7 b' Defaulting color scheme to \'NoColor\'"""' | |||||
2555 | Note also that the variables will need to be pickleable; most basic |
|
2555 | Note also that the variables will need to be pickleable; most basic | |
2556 | python types can be safely %stored. |
|
2556 | python types can be safely %stored. | |
2557 | """ |
|
2557 | """ | |
2558 |
|
2558 | |||
2559 | opts,args = self.parse_options(parameter_s,'dr',mode='list') |
|
2559 | opts,args = self.parse_options(parameter_s,'dr',mode='list') | |
2560 | # delete |
|
2560 | # delete | |
2561 | if opts.has_key('d'): |
|
2561 | if opts.has_key('d'): | |
@@ -2573,33 +2573,30 b' Defaulting color scheme to \'NoColor\'"""' | |||||
2573 | for k in self.shell.persist.keys(): |
|
2573 | for k in self.shell.persist.keys(): | |
2574 | if k.startswith('S:'): |
|
2574 | if k.startswith('S:'): | |
2575 | del self.shell.persist[k] |
|
2575 | del self.shell.persist[k] | |
2576 |
|
2576 | |||
2577 | # run without arguments -> list variables & values |
|
2577 | # run without arguments -> list variables & values | |
2578 | elif not args: |
|
2578 | elif not args: | |
2579 |
vars = [v[2:] for v in self.shell.persist.keys() |
|
2579 | vars = [v[2:] for v in self.shell.persist.keys() | |
|
2580 | if v.startswith('S:')] | |||
2580 | vars.sort() |
|
2581 | vars.sort() | |
2581 | if vars: |
|
2582 | if vars: | |
2582 | size = max(map(len,vars)) |
|
2583 | size = max(map(len,vars)) | |
2583 | else: |
|
2584 | else: | |
2584 | size = 0 |
|
2585 | size = 0 | |
2585 |
|
2586 | |||
2586 | fmt = '%-'+str(size)+'s -> %s' |
|
|||
2587 | print 'Stored variables and their in-memory values:' |
|
2587 | print 'Stored variables and their in-memory values:' | |
|
2588 | fmt = '%-'+str(size)+'s -> %s' | |||
|
2589 | get = self.shell.user_ns.get | |||
2588 | for var in vars: |
|
2590 | for var in vars: | |
2589 | # print 30 first characters from every var |
|
2591 | # print 30 first characters from every var | |
2590 |
print fmt % (var,repr( |
|
2592 | print fmt % (var,repr(get(var,'<unavailable>'))[:50]) | |
2591 |
|
2593 | |||
2592 | # default action - store the variable |
|
2594 | # default action - store the variable | |
2593 | else: |
|
2595 | else: | |
2594 | pickled = pickle.dumps(self.shell.user_ns[args[0] ]) |
|
2596 | pickled = pickle.dumps(self.shell.user_ns[args[0] ]) | |
2595 | self.shell.persist[ 'S:' + args[0] ] = pickled |
|
2597 | self.shell.persist[ 'S:' + args[0] ] = pickled | |
2596 | print "Stored '%s' (%d bytes)" % (args[0], len(pickled)) |
|
2598 | print "Stored '%s' (%d bytes)" % (args[0], len(pickled)) | |
2597 |
|
2599 | |||
2598 |
|
||||
2599 |
|
||||
2600 |
|
||||
2601 |
|
||||
2602 |
|
||||
2603 | def magic_bookmark(self, parameter_s=''): |
|
2600 | def magic_bookmark(self, parameter_s=''): | |
2604 | """Manage IPython's bookmark system. |
|
2601 | """Manage IPython's bookmark system. | |
2605 |
|
2602 |
General Comments 0
You need to be logged in to leave comments.
Login now