##// END OF EJS Templates
Change banner, %quickref
vivainio -
Show More
@@ -6,7 +6,7 b' Requires Python 2.1 or better.'
6
6
7 This file contains the main make_IPython() starter function.
7 This file contains the main make_IPython() starter function.
8
8
9 $Id: ipmaker.py 2704 2007-09-01 14:32:05Z vivainio $"""
9 $Id: ipmaker.py 2710 2007-09-04 21:10:10Z vivainio $"""
10
10
11 #*****************************************************************************
11 #*****************************************************************************
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -112,8 +112,8 b' def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1,'
112 "IPython %s -- An enhanced Interactive Python."
112 "IPython %s -- An enhanced Interactive Python."
113 % (__version__,),
113 % (__version__,),
114 """\
114 """\
115 ? or %quickref -> Introduction to IPython's features, or quick reference.
115 ? -> Introduction to IPython's features
116 %magic -> Information about IPython's 'magic' % functions.
116 %quickref -> Quick reference.
117 help -> Python's own help system.
117 help -> Python's own help system.
118 object? -> Details about 'object'. ?object also works, ?? prints more.
118 object? -> Details about 'object'. ?object also works, ?? prints more.
119 """ ]
119 """ ]
@@ -6,7 +6,7 b''
6 # the file COPYING, distributed as part of this software.
6 # the file COPYING, distributed as part of this software.
7 #*****************************************************************************
7 #*****************************************************************************
8
8
9 # $Id: usage.py 2683 2007-08-28 20:01:15Z vivainio $
9 # $Id: usage.py 2710 2007-09-04 21:10:10Z vivainio $
10
10
11 from IPython import Release
11 from IPython import Release
12 __author__ = '%s <%s>' % Release.authors['Fernando']
12 __author__ = '%s <%s>' % Release.authors['Fernando']
@@ -605,11 +605,16 b' IPython -- An enhanced Interactive Python - Quick Reference Card'
605 obj?, obj??, ?obj,??obj : Get help, or more help for object
605 obj?, obj??, ?obj,??obj : Get help, or more help for object
606 ?os.p* : List names in os starting with p
606 ?os.p* : List names in os starting with p
607
607
608 Example magic:
608 Magic functions are prefixed by %, and typically take their arguments without
609 parentheses, quotes or even commas for convenience.
610
611 Example magic function calls:
609
612
610 %alias d ls -F : 'd' is now an alias for 'ls -F'
613 %alias d ls -F : 'd' is now an alias for 'ls -F'
611 alias d ls -F : Works if 'alias' not a python name
614 alias d ls -F : Works if 'alias' not a python name
612 alist = %alias : Get list of aliases to 'alist'
615 alist = %alias : Get list of aliases to 'alist'
616 cd /usr/share : Obvious. cd -<tab> to choose from visited dirs.
617 %cd?? : See help AND source for magic %cd
613
618
614 System commands:
619 System commands:
615
620
@@ -618,7 +623,6 b' cp a.txt b/ : after %rehashx, most system commands work without !'
618 cp ${f}.txt $bar : Variable expansion in magics and system commands
623 cp ${f}.txt $bar : Variable expansion in magics and system commands
619 files = !ls /usr : Capture sytem command output
624 files = !ls /usr : Capture sytem command output
620 files.s, files.l, files.n: "a b c", ['a','b','c'], 'a\nb\nc'
625 files.s, files.l, files.n: "a b c", ['a','b','c'], 'a\nb\nc'
621 cd /usr/share : Obvious. cd -<tab> to choose from visited dirs.
622
626
623 History:
627 History:
624
628
@@ -629,7 +633,7 b' exec _i81 : Execute input history line #81 again'
629 _, __, ___ : previous, next previous, next next previous output
633 _, __, ___ : previous, next previous, next next previous output
630 _dh : Directory history
634 _dh : Directory history
631 _oh : Output history
635 _oh : Output history
632 %hist : Command history. '-g foo' search history for 'foo'
636 %hist : Command history. '%hist -g foo' search history for 'foo'
633
637
634 Autocall:
638 Autocall:
635
639
@@ -638,6 +642,11 b' f 1,2 : f(1,2)'
638 ,f 1 2 : f("1","2")
642 ,f 1 2 : f("1","2")
639 ;f 1 2 : f("1 2")
643 ;f 1 2 : f("1 2")
640
644
645 Remember: TAB completion works in many contexts, not just file names
646 or python names.
647
648 The following magic functions are currently available:
649
641 """
650 """
642
651
643
652
@@ -3,6 +3,9 b''
3 * ipy_profile_zope.py: add zope profile, by Stefan Eletzhofer.
3 * ipy_profile_zope.py: add zope profile, by Stefan Eletzhofer.
4 Relicensed under BSD with the authors approval.
4 Relicensed under BSD with the authors approval.
5
5
6 * ipmaker.py, usage.py: Remove %magic from default banner, improve
7 %quickref
8
6 2007-09-03 Ville Vainio <vivainio@gmail.com>
9 2007-09-03 Ville Vainio <vivainio@gmail.com>
7
10
8 * Magic.py: %time now passes expression through prefilter,
11 * Magic.py: %time now passes expression through prefilter,
General Comments 0
You need to be logged in to leave comments. Login now