##// END OF EJS Templates
Tiny cleanups before next round of patches, so I have a safe revert point.
fperez -
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 969 2005-12-29 17:18:31Z fperez $"""
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
@@ -2576,18 +2576,20 b' Defaulting color scheme to \'NoColor\'"""'
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() if v.startswith('S:')]
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(self.shell.user_ns.get(var, '<unavailable>'))[:50])
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:
@@ -2595,11 +2597,6 b' Defaulting color scheme to \'NoColor\'"""'
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