improve callable alias inspection

IPython/Extensions/ipy_profile_sh.py

@@ -31,8 +31,17 b' def main():'
     
     # beefed up %env is handy in shell mode
     import envpersist
+    
+    # To see where mycmd resides (in path/aliases), do %which mycmd 
     import ipy_which
+    
+    # tab completers for hg, svn, ...
     import ipy_app_completers
+    
+    # To make executables foo and bar in mybin usable without PATH change, do:
+    # %rehashdir c:/mybin
+    # %store foo
+    # %store bar
     import ipy_rehashdir
     import ipy_signals
     
@@ -48,7 +57,7 b' def main():'
     from IPython import Release
 
     import sys
-    # I like my banner minimal.
+    # Non-chatty banner
     o.banner = "IPython %s   [on Py %s]\n" % (Release.version,sys.version.split(None,1)[0])
     
     

IPython/Extensions/ipy_which.py

@@ -26,6 +26,12 b' def which_alias(fname):'
     for al, tgt in ip.IP.alias_table.items():
         if not (al == fname or fnmatch(al, fname)):
             continue
+        if callable(tgt):
+            print "Callable alias",tgt
+            d = tgt.__doc__
+            if d:
+                print "Docstring:\n",d
+                continue
         trg = tgt[1]
         
         trans = ip.expand_alias(trg)

IPython/OInspect.py

@@ -6,7 +6,7 b' Uses syntax highlighting for presenting the various information elements.'
 Similar in spirit to the inspect module, but all calls take a name argument to
 reference the name under which an object is being read.
 
-$Id: OInspect.py 2597 2007-08-08 22:41:02Z fperez $
+$Id: OInspect.py 2717 2007-09-05 19:49:42Z vivainio $
 """
 
 #*****************************************************************************
@@ -341,9 +341,14 b' class Inspector:'
         # Get docstring, special-casing aliases:
         if isalias:
             if not callable(obj):
-                ds = "Alias to the system command:\n  %s" % obj[1]
+                try:
+                    ds = "Alias to the system command:\n  %s" % obj[1]
+                except:
+                    ds = "Alias: " + str(obj)
             else:
                 ds = "Alias to " + str(obj)
+                if obj.__doc__:
+                    ds += "\nDocstring:\n" + obj.__doc__
         else:
             ds = getdoc(obj)
             if ds is None:

doc/ChangeLog

@@ -13,7 +13,9 b''
 
 	* Extensions/ipy_profile_sh.py: Try to detect cygwin on win32,
 	if not available load ipy_fsops.py for cp, mv, etc. replacements
-        
+
+	* OInspect.py, ipy_which.py: improve %which and obj? for callable
+	aliases
         
 2007-09-04  Ville Vainio  <[e-mail]>