ipy_exportdb now tolerates new style aliases'

IPython/Extensions/ipy_exportdb.py

@@ -1,73 +1,76 b''
 import IPython.ipapi
 ip = IPython.ipapi.get()
 
 import os,pprint
 
 def export(filename = None):
 
     lines = ['import IPython.ipapi', 'ip = IPython.ipapi.get()','']
 
     vars = ip.db.keys('autorestore/*')
     vars.sort()
     varstomove = []
     get = ip.db.get
     
     macros = []
     variables = []
     
     for var in vars:
         k = os.path.basename(var)
         v = get(var)
 
         if k.startswith('_'):
             continue
         if isinstance(v, IPython.macro.Macro):
             macros.append((k,v))
         if type(v) in [int, str, float]:
             variables.append((k,v))
             
             
 
     if macros:
         lines.extend(['# === Macros ===' ,''])
     for k,v in macros:
         lines.append("ip.defmacro('%s'," % k)
         for line in v.value.splitlines():
             lines.append(' ' + repr(line+'\n'))
         lines.extend([')', ''])
         
     if variables:
         lines.extend(['','# === Variables ===',''])
         for k,v in variables:
             varstomove.append(k)
             lines.append('%s = %s' % (k,repr(v)))
                 
         lines.append('ip.to_user_ns("%s")' % (' '.join(varstomove)))
     
     bkms = ip.db.get('bookmarks',{})
     
     if bkms:
         lines.extend(['','# === Bookmarks ===',''])
         lines.append("ip.db['bookmarks'] = %s " % pprint.pformat(bkms, indent = 2) )
         
     aliases = ip.db.get('stored_aliases', {} )
     
     if aliases:
         lines.extend(['','# === Alias definitions ===',''])
         for k,v in aliases.items():
+            try:
             lines.append("ip.defalias('%s', %s)" % (k, repr(v[1])))
+            except (AttributeError, TypeError):
+                pass
 
     env = ip.db.get('stored_env')
     if env:
         lines.extend(['','# === Stored env vars ===',''])
         lines.append("ip.db['stored_env'] = %s " % pprint.pformat(env, indent = 2) )
         
     
     
     out = '\n'.join(lines)
     
     if filename:
         open(filename,'w').write(out)
     else:
         print out
     

IPython/Release.py

@@ -1,83 +1,83 b''
 # -*- coding: utf-8 -*-
 """Release data for the IPython project.
 
-$Id: Release.py 2677 2007-08-27 18:22:15Z vivainio $"""
+$Id: Release.py 2681 2007-08-28 17:51:38Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 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).
 
-revision = '2676'
+revision = '2680M'
 
 version = '0.8.2.svn.r' + revision.rstrip('M')
 
 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. 
 
  The latest development version is always available at the IPython subversion
  repository_.
 
 .. _repository: http://ipython.scipy.org/svn/ipython/ipython/trunk#egg=ipython-dev
  """
 
 license = 'BSD'
 
 authors = {'Fernando' : ('Fernando Perez','[e-mail]'),
            'Janko'    : ('Janko Hauser','[e-mail]'),
            'Nathan'   : ('Nathaniel Gray','[e-mail]'),
            'Ville'    : ('Ville Vainio','[e-mail]')           
            }
 
 url = 'http://ipython.scipy.org'
 
 download_url = 'http://ipython.scipy.org/dist'
 
 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
 
 keywords = ['Interactive','Interpreter','Shell']