- fix bug where aliases would shadow variables when autocall was fully off.

- add a flag to controlat what detail level strings are computed when foo?
is requested.

Both after problems reported by SAGE

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 1300 2006-05-15 16:27:36Z vivainio $
+$Id: OInspect.py 1329 2006-05-26 07:52:45Z fperez $
 """
 
 #*****************************************************************************
@@ -107,10 +107,12 b' class myStringIO(StringIO.StringIO):'
         self.write('\n')
 
 class Inspector:
-    def __init__(self,color_table,code_color_table,scheme):
+    def __init__(self,color_table,code_color_table,scheme,
+                 str_detail_level=0):
         self.color_table = color_table
         self.parser = PyColorize.Parser(code_color_table,out='str')
         self.format = self.parser.format
+        self.str_detail_level = str_detail_level
         self.set_active_scheme(scheme)
 
     def __getargspec(self,obj):
@@ -302,6 +304,7 b' class Inspector:'
         except: pass
 
         # String form, but snip if too long in ? form (full in ??)
+        if detail_level >= self.str_detail_level:
         try:
             ostr = str(obj)
             str_head = 'String Form:'

IPython/UserConfig/ipythonrc

@@ -1,5 +1,5 b''
 # -*- Mode: Shell-Script -*-  Not really, but shows comments correctly
-# $Id: ipythonrc 1324 2006-05-24 20:25:11Z fperez $
+# $Id: ipythonrc 1329 2006-05-26 07:52:45Z fperez $
 
 #***************************************************************************
 #
@@ -299,6 +299,16 b' nosep 0'
 
 wildcards_case_sensitive 1
 
+# Object information: at what level of detail to display the string form of an
+# object.  If set to 0, ipython will compute the string form of any object X,
+# by calling str(X), when X? is typed.  If set to 1, str(X) will only be
+# computed when X?? is given, and if set to 2 or higher, it will never be
+# computed (there is no X??? level of detail).  This is mostly of use to
+# people who frequently manipulate objects whose string representation is
+# extremely expensive to compute.
+
+object_info_string_level 0
+
 # xmode - Exception reporting mode. 
 
 # Valid modes: Plain, Context and Verbose.

IPython/iplib.py

@@ -6,7 +6,7 b' Requires Python 2.3 or newer.'
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 1326 2006-05-25 02:07:11Z fperez $
+$Id: iplib.py 1329 2006-05-26 07:52:45Z fperez $
 """
 
 #*****************************************************************************
@@ -537,10 +537,6 b' class InteractiveShell(object,Magic):'
         # and add any custom exception handlers the user may have specified
         self.set_custom_exc(*custom_exceptions)
 
-        # Object inspector
-        self.inspector = OInspect.Inspector(OInspect.InspectColors,
-                                            PyColorize.ANSICodeColors,
-                                            'NoColor')
         # indentation management
         self.autoindent = False
         self.indent_current_nsp = 0
@@ -608,6 +604,12 b' class InteractiveShell(object,Magic):'
 
         rc = self.rc
         
+        # Object inspector
+        self.inspector = OInspect.Inspector(OInspect.InspectColors,
+                                            PyColorize.ANSICodeColors,
+                                            'NoColor',
+                                            rc.object_info_string_level)
+        
         # Load readline proper
         if rc.readline:
             self.init_readline()
@@ -1874,9 +1876,6 b' want to merge them back into the new files.""" % locals()'
             rewritten = pre + rewritten  # add indentation
             return self.handle_normal(rewritten)
             
-        
-        
-
         #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest)  # dbg
 
         # First check for explicit escapes in the last/first character
@@ -1941,6 +1940,16 b' want to merge them back into the new files.""" % locals()'
                 # in this case, all that's left is either an alias or
                 # processing the line normally.
                 if iFun in self.alias_table:
+                    # if autocall is off, by not running _ofind we won't know
+                    # whether the given name may also exist in one of the
+                    # user's namespace.  At this point, it's best to do a
+                    # quick check just to be sure that we don't let aliases
+                    # shadow variables.
+                    head = iFun.split('.',1)[0]
+                    if head in self.user_ns or head in self.internal_ns \
+                       or head in __builtin__.__dict__:
+                        return self.handle_normal(line,continue_prompt)
+                    else:
                     return self.handle_alias(line,continue_prompt,
                                              pre,iFun,theRest)
                  

IPython/ipmaker.py

@@ -6,7 +6,7 b' Requires Python 2.1 or better.'
 
 This file contains the main make_IPython() starter function.
 
-$Id: ipmaker.py 1328 2006-05-25 07:47:56Z fperez $"""
+$Id: ipmaker.py 1329 2006-05-26 07:52:45Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <[e-mail]>
@@ -155,7 +155,8 b" object? -> Details about 'object'. ?object also works, ?? prints more."
     # Make sure there's a space before each end of line (they get auto-joined!)
     cmdline_opts = ('autocall=i autoindent! automagic! banner! cache_size|cs=i '
                     'c=s classic|cl color_info! colors=s confirm_exit! '
-                    'debug! deep_reload! editor=s log|l messages! nosep pdb! '
+                    'debug! deep_reload! editor=s log|l messages! nosep '
+                    'object_info_string_level=i pdb! '
                     'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s '
                     'quick screen_length|sl=i prompts_pad_left=i '
                     'logfile|lf=s logplay|lp=s profile|p=s '
@@ -202,6 +203,7 b" object? -> Details about 'object'. ?object also works, ?? prints more."
                       logplay = '',
                       multi_line_specials = 1,
                       messages = 1,
+                      object_info_string_level = 0,
                       nosep = 0,
                       pdb = 0,
                       pprint = 0,

doc/ChangeLog

@@ -1,3 +1,18 b''
[phone]  Fernando Perez  <[e-mail]>
+
+	* IPython/iplib.py (_prefilter): fix bug where aliases would
+	shadow variables when autocall was fully off.  Reported by SAGE
+	author William Stein.
+
+	* IPython/OInspect.py (Inspector.__init__): add a flag to control
+	at what detail level strings are computed when foo? is requested.
+	This allows users to ask for example that the string form of an
+	object is only computed when foo?? is called, or even never, by
+	setting the object_info_string_level >= 2 in the configuration
+	file.  This new option has been added and documented.  After a
+	request by SAGE to be able to control the printing of very large
+	objects more easily.
+
 2006-05-25  Fernando Perez  <[e-mail]>
 
 	* IPython/ipmaker.py (make_IPython): remove the ipython call path