Simple change to add svn revision info at the top level and crash handler.

Useful for debugging.

IPython/CrashHandler.py

@@ -1,109 +1,110 b''
 # -*- coding: utf-8 -*-
 """sys.excepthook for IPython itself, leaves a detailed report on disk.
 
-$Id: CrashHandler.py 410 2004-11-04 07:58:17Z fperez $"""
+$Id: CrashHandler.py 775 2005-09-01 20:24:59Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2004 Fernando Perez. <[e-mail]>
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
 from IPython import Release
-__author__  = '%s <%s>' % Release.authors['Fernando']
-__license__ = Release.license
-__version__ = Release.version
+__author__   = '%s <%s>' % Release.authors['Fernando']
+__license__  = Release.license
+__version__  = Release.version
 
 #****************************************************************************
 # Required modules
 
 # From the standard library
 import os,sys
 from pprint import pprint,pformat
 
 # Homebrewed
 from IPython.genutils import *
 from IPython.Itpl import Itpl,itpl,printpl
 from IPython import ultraTB
 from IPython.ultraTB import ColorScheme,ColorSchemeTable  # too long names
 
 #****************************************************************************
 class CrashHandler:
     """sys.excepthook for IPython itself, leaves a detailed report on disk."""
 
     def __init__(self,IP):
         self.IP = IP  # IPython instance
         self.bug_contact = Release.authors['Fernando'][0]
         self.mailto = Release.authors['Fernando'][1]
 
     def __call__(self,etype, evalue, etb):
 
         # Report tracebacks shouldn't use color in general (safer for users)
         color_scheme = 'NoColor'
 
         # Use this ONLY for developer debugging (keep commented out for release)
         #color_scheme = 'Linux'   # dbg
         
         try:
             rptdir = self.IP.rc.ipythondir
         except:
             rptdir = os.getcwd()
         if not os.path.isdir(rptdir):
             rptdir = os.getcwd()
         self.report_name = os.path.join(rptdir,'IPython_crash_report.txt')
         self.TBhandler = ultraTB.VerboseTB(color_scheme=color_scheme,long_header=1)
         traceback = self.TBhandler.text(etype,evalue,etb,context=31)
 
         # print traceback to screen
         print >> sys.stderr, traceback
 
         # and generate a complete report on disk
         try:
             report = open(self.report_name,'w')
         except:
             print >> sys.stderr, 'Could not create crash report on disk.'
             return
 
         msg = itpl('\n'+'*'*70+'\n'
 """
 Oops, IPython crashed. We do our best to make it stable, but...
 
 A crash report was automatically generated with the following information:
   - A verbatim copy of the traceback above this text.
   - A copy of your input history during this session.
   - Data on your current IPython configuration.
 
 It was left in the file named:
 \t'$self.report_name'
 If you can email this file to the developers, the information in it will help
 them in understanding and correcting the problem.
 
 You can mail it to $self.bug_contact at $self.mailto
 with the subject 'IPython Crash Report'.
 
 If you want to do it now, the following command will work (under Unix):
 mail -s 'IPython Crash Report' $self.mailto < $self.report_name
 
 To ensure accurate tracking of this issue, please file a report about it at:
 http://www.scipy.net/roundup/ipython  (IPython's online bug tracker).
 """)
         print >> sys.stderr, msg
 
         sec_sep = '\n\n'+'*'*75+'\n\n'
         report.write('*'*75+'\n\n'+'IPython post-mortem report\n\n')
-        report.write('IPython version: %s \n\n' % __version__)
+        report.write('IPython version: %s \n\n' % Release.version)
+        report.write('SVN revision   : %s \n\n' % Release.revision)
         report.write('Platform info  : os.name -> %s, sys.platform -> %s' %
                      (os.name,sys.platform) )
         report.write(sec_sep+'Current user configuration structure:\n\n')
         report.write(pformat(self.IP.rc.dict()))
         report.write(sec_sep+'Crash traceback:\n\n' + traceback)
         try:
             report.write(sec_sep+"History of session input:")
             for line in self.IP.user_ns['_ih']:
                 report.write(line)
             report.write('\n*** Last line of input (may not be in above history):\n')
             report.write(self.IP._last_input_line+'\n')
         except:
             pass
         report.close()

IPython/Release.py

@@ -1,72 +1,74 b''
 # -*- coding: utf-8 -*-
 """Release data for the IPython project.
 
-$Id: Release.py 750 2005-08-24 17:36:16Z fperez $"""
+$Id: Release.py 775 2005-09-01 20:24:59Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2005 Fernando Perez <[e-mail]>
 #
 #       Copyright (c) 2001 Janko Hauser <[e-mail]> and Nathaniel Gray
 #       <[e-mail]>
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
 # Name of the package for release purposes.  This is the name which labels
 # the tarballs and RPMs made by distutils, so it's best to lowercase it.
 name = 'ipython'
 
 # For versions with substrings (like 0.6.16.svn), use an extra . to separate
 # the new substring.  We have to avoid using either dashes or underscores,
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
 version = '0.6.16.svn'
 
+revision = '$Revision: 775 $'
+
 description = "An enhanced interactive Python shell."
 
 long_description = \
 """
 IPython provides a replacement for the interactive Python interpreter with
 extra functionality.
 
 Main features:
 
  * Comprehensive object introspection.
 
  * Input history, persistent across sessions.
 
  * Caching of output results during a session with automatically generated
    references.
 
  * Readline based name completion.
 
  * Extensible system of 'magic' commands for controlling the environment and
    performing many tasks related either to IPython or the operating system.
 
  * Configuration system with easy switching between different setups (simpler
    than changing $PYTHONSTARTUP environment variables every time).
 
  * Session logging and reloading.
 
  * Extensible syntax processing for special purpose situations.
 
  * Access to the system shell with user-extensible alias system.
 
  * Easily embeddable in other Python programs.
 
  * Integrated access to the pdb debugger and the Python profiler. """
 
 license = 'BSD'
 
 authors = {'Fernando' : ('Fernando Perez','[e-mail]'),
            'Janko'    : ('Janko Hauser','[e-mail]'),
            'Nathan'   : ('Nathaniel Gray','[e-mail]')
            }
 
 url = 'http://ipython.scipy.org'
 
 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
 
 keywords = ['Interactive','Interpreter','Shell']

IPython/__init__.py

@@ -1,63 +1,64 b''
 # -*- coding: utf-8 -*-
 """
 IPython -- An enhanced Interactive Python
 
 One of Python's nicest features is its interactive interpreter. This allows
 very fast testing of ideas without the overhead of creating test files as is
 typical in most programming languages. However, the interpreter supplied with
 the standard Python distribution is fairly primitive (and IDLE isn't really
 much better).
 
 IPython tries to:
 
   i - provide an efficient environment for interactive work in Python
   programming. It tries to address what we see as shortcomings of the standard
   Python prompt, and adds many features to make interactive work much more
   efficient.
 
   ii - offer a flexible framework so that it can be used as the base
   environment for other projects and problems where Python can be the
   underlying language. Specifically scientific environments like Mathematica,
   IDL and Mathcad inspired its design, but similar ideas can be useful in many
   fields. Python is a fabulous language for implementing this kind of system
   (due to its dynamic and introspective features), and with suitable libraries
   entire systems could be built leveraging Python's power.
 
   iii - serve as an embeddable, ready to go interpreter for your own programs.
 
 IPython requires Python 2.2 or newer.
 
-$Id: __init__.py 530 2005-03-02 07:11:15Z fperez $"""
+$Id: __init__.py 775 2005-09-01 20:24:59Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2004 Fernando Perez. <[e-mail]>
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
 # Enforce proper version requirements
 import sys
 if sys.version[0:3] < '2.2':
     raise ImportError, 'Python Version 2.2 or above is required.'
         
 # Define what gets imported with a 'from IPython import *'
 __all__ = ['deep_reload','genutils','ultraTB','DPyGetOpt','Itpl','hooks',
            'ConfigLoader','OutputTrap','Release','Struct','Shell']
 
 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
 # access to them via IPython.<name>
 glob,loc = globals(),locals()
 for name in __all__:
     __import__(name,glob,loc,[])
 
 # Release data
 from IPython import Release # do it explicitly so pydoc can see it - pydoc bug
-__author__  = '%s <%s>\n%s <%s>\n%s <%s>' % \
-              ( Release.authors['Fernando'] + Release.authors['Janko'] + \
-                Release.authors['Nathan'] )
-__license__ = Release.license
-__version__ = Release.version
+__author__   = '%s <%s>\n%s <%s>\n%s <%s>' % \
+               ( Release.authors['Fernando'] + Release.authors['Janko'] + \
+                 Release.authors['Nathan'] )
+__license__  = Release.license
+__version__  = Release.version
+__revision__ = Release.revision
 
 # Namespace cleanup
 del name,glob,loc