Merge.

docs/examples/core/ipython-sh.desktop

@@ -0,0 +1,22 b''
+# If you want ipython to appear in a linux app launcher ("start menu"), install this by doing:
+# sudo desktop-file-install ipython-sh.desktop
+
+[Desktop Entry]
+Comment=Perform shell-like tasks in interactive ipython session
+Exec=ipython -p sh
+GenericName[en_US]=IPython shell mode
+GenericName=IPython shell mode
+Icon=gnome-netstatus-idle
+MimeType=
+Name[en_US]=ipython-sh
+Name=ipython-sh
+Path=
+Categories=Development;Utility;
+StartupNotify=false
+Terminal=true
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=none
+X-KDE-SubstituteUID=false
+X-KDE-Username=

docs/examples/core/ipython.desktop

@@ -0,0 +1,22 b''
+# If you want ipython to appear in a linux app launcher ("start menu"), install this by doing:
+# sudo desktop-file-install ipython.desktop
+
+[Desktop Entry]
+Comment=Enhanced interactive Python shell
+Exec=ipython
+GenericName[en_US]=IPython
+GenericName=IPython
+Icon=gnome-netstatus-idle
+MimeType=
+Name[en_US]=ipython
+Name=ipython
+Path=
+Categories=Development;Utility;
+StartupNotify=false
+Terminal=true
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=none
+X-KDE-SubstituteUID=false
+X-KDE-Username=

scripts/ipython-wx

@@ -0,0 +1,11 b''
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""wxIPython -- An enhanced Interactive Python GUI fonrtend
+This script starts the Wx graphical frontend.
+This is experimental so far.
+Currently it support only ipython0 instance. Will be upgraded to ipython1 one.
+"""
+
+from IPython.gui.wx import wxIPython
+
+wxIPython.main()

IPython/ColorANSI.py

@@ -26,6 +26,7 b' def make_color_table(in_class):'
     Helper function for building the *TermColors classes."""
     
     color_templates = (
+        # Dark colors
         ("Black"       , "0;30"),
         ("Red"         , "0;31"),
         ("Green"       , "0;32"),
@@ -34,6 +35,7 b' def make_color_table(in_class):'
         ("Purple"      , "0;35"),
         ("Cyan"        , "0;36"),
         ("LightGray"   , "0;37"),
+        # Light colors
         ("DarkGray"    , "1;30"),
         ("LightRed"    , "1;31"),
         ("LightGreen"  , "1;32"),
@@ -41,7 +43,17 b' def make_color_table(in_class):'
         ("LightBlue"   , "1;34"),
         ("LightPurple" , "1;35"),
         ("LightCyan"   , "1;36"),
-        ("White"       , "1;37"),  )
+        ("White"       , "1;37"),  
+        # Blinking colors.  Probably should not be used in anything serious.
+        ("BlinkBlack"  , "5;30"),
+        ("BlinkRed"    , "5;31"),
+        ("BlinkGreen"  , "5;32"),
+        ("BlinkYellow" , "5;33"),
+        ("BlinkBlue"   , "5;34"),
+        ("BlinkPurple" , "5;35"),
+        ("BlinkCyan"   , "5;36"),
+        ("BlinkLightGray", "5;37"),
+        )
 
     for name,value in color_templates:
         setattr(in_class,name,in_class._base % value)

IPython/Release.py

@@ -23,9 +23,9 b" name = 'ipython'"
 # bdist_deb does not accept underscores (a Debian convention).
 
 development = False    # change this to False to do a release
-version_base = '0.9.beta3'
+version_base = '0.9.rc1'
 branch = 'ipython'
-revision = '1106'
+revision = '1124'
 
 if development:
     if branch == 'ipython':

IPython/UserConfig/ipythonrc-physics

@@ -38,6 +38,8 b' ececute rad = pi/180.'
 execute print '*** q is an alias for PhysicalQuantityInteractive'
 execute print '*** g = 9.8 m/s^2 has been defined'
 execute print '*** rad = pi/180  has been defined'
+execute import ipy_constants as C
+execute print '*** C is the physical constants module'
 
 # Files to execute
 execfile 

IPython/gui/wx/ipshell_nonblocking.py

@@ -154,13 +154,18 b' class NonBlockingIPShell(object):'
         self._term = IPython.genutils.IOTerm(cin=cin, cout=cout, cerr=cerr)
 
         excepthook = sys.excepthook
-
+        #Hack to save sys.displayhook, because ipython seems to overwrite it...
+        self.sys_displayhook_ori = sys.displayhook
+        
         self._IP = IPython.Shell.make_IPython(
                                     argv,user_ns=user_ns,
                                     user_global_ns=user_global_ns,
                                     embedded=True,
                                     shell_class=IPython.Shell.InteractiveShell)
 
+        #we restore sys.displayhook
+        sys.displayhook = self.sys_displayhook_ori
+
         #we replace IPython default encoding by wx locale encoding
         loc = locale.getpreferredencoding()
         if loc:
@@ -195,8 +200,9 b' class NonBlockingIPShell(object):'
 
         self._line_to_execute = line
         #we launch the ipython line execution in a thread to make it interruptible
-        ce = _CodeExecutor(self, self._afterExecute)
-        ce.start()
+        #with include it in self namespace to be able to call ce.raise_exc(KeyboardInterrupt)
+        self.ce = _CodeExecutor(self, self._afterExecute)
+        self.ce.start()
         
     #----------------------- IPython management section ----------------------    
     def getDocText(self):

IPython/gui/wx/ipython_view.py

@@ -30,6 +30,21 b' import wx.stc as stc'
 import re
 from StringIO import StringIO
 
+import sys
+import codecs
+import locale
+for enc in (locale.getpreferredencoding(),
+            sys.getfilesystemencoding(),
+            sys.getdefaultencoding()):
+    try:
+        codecs.lookup(enc)
+        ENCODING = enc
+        break
+    except LookupError:
+        pass
+else:
+    ENCODING = 'utf-8'
+
 from ipshell_nonblocking import NonBlockingIPShell
 
 class WxNonBlockingIPShell(NonBlockingIPShell):
@@ -604,7 +619,7 b' class IPShellWidget(wx.Panel):'
         self.text_ctrl.write('\n')
         lines_to_execute = lines.replace('\t',' '*4)
         lines_to_execute = lines_to_execute.replace('\r','')
-        self.IP.doExecute(lines_to_execute.encode('cp1252'))
+        self.IP.doExecute(lines_to_execute.encode(ENCODING))
         self.updateHistoryTracker(lines)
         self.setCurrentState('WAIT_END_OF_EXECUTION')
         

IPython/gui/wx/wxIPython.py

@@ -2,7 +2,7 b''
 # -*- coding: iso-8859-15 -*-
 
 import wx.aui
-
+import sys
 #used for about dialog
 from wx.lib.wordwrap import wordwrap
 
@@ -10,6 +10,9 b' from wx.lib.wordwrap import wordwrap'
 from IPython.gui.wx.ipython_view import IPShellWidget
 from IPython.gui.wx.ipython_history import IPythonHistoryPanel
 
+#used to create options.conf file in user directory
+from IPython.ipapi import get
+
 __version__ = 0.8
 __author__  = "Laurent Dufrechou"
 __email__   = "laurent.dufrechou _at_ gmail.com"
@@ -84,7 +87,9 b' class MyFrame(wx.Frame):'
         dlg.Destroy()
 
     def optionSave(self, name, value):
-        opt = open('options.conf','w')
+        ip = get()
+        path = ip.IP.rc.ipythondir
+        opt = open(path + '/options.conf','w')
 
         try:
             options_ipython_panel = self.ipython_panel.getOptions()
@@ -98,24 +103,31 b' class MyFrame(wx.Frame):'
             opt.close()
         
     def optionLoad(self):
-        opt = open('options.conf','r')
-        lines = opt.readlines()
-        opt.close()
+        try:
+            ip = get()
+            path = ip.IP.rc.ipythondir
+            opt = open(path + '/options.conf','r')
+            lines = opt.readlines()
+            opt.close()
                       
-        options_ipython_panel = self.ipython_panel.getOptions()
-        options_history_panel = self.history_panel.getOptions()
-        
-        for line in lines:
-            key = line.split('=')[0]
-            value = line.split('=')[1].replace('\n','').replace('\r','')
-            if key in options_ipython_panel.keys():
-                options_ipython_panel[key]['value'] = value
-            elif key in options_history_panel.keys():
-                options_history_panel[key]['value'] = value
-            else:
-                print >>sys.__stdout__,"Warning: key ",key,"not found in widget options. Check Options.conf"
-        self.ipython_panel.reloadOptions(options_ipython_panel)
-        self.history_panel.reloadOptions(options_history_panel)
+            options_ipython_panel = self.ipython_panel.getOptions()
+            options_history_panel = self.history_panel.getOptions()
+            
+            for line in lines:
+                key = line.split('=')[0]
+                value = line.split('=')[1].replace('\n','').replace('\r','')
+                if key in options_ipython_panel.keys():
+                    options_ipython_panel[key]['value'] = value
+                elif key in options_history_panel.keys():
+                    options_history_panel[key]['value'] = value
+                else:
+                    print >>sys.__stdout__,"Warning: key ",key,"not found in widget options. Check Options.conf"
+            self.ipython_panel.reloadOptions(options_ipython_panel)
+            self.history_panel.reloadOptions(options_history_panel)
+        
+        except IOError:
+            print >>sys.__stdout__,"Could not open Options.conf, defaulting to default values."
+            
         
     def createMenu(self):
         """local method used to create one menu bar"""

MANIFEST.in

@@ -30,3 +30,4 b' global-exclude *.pyc'
 global-exclude .dircopy.log
 global-exclude .svn
 global-exclude .bzr
+global-exclude .hgignore

docs/Makefile

@@ -28,17 +28,16 b' help:'
 	@echo "dist         all, and then puts the results in dist/"
 
 clean:
-	-rm -rf build/*
+	-rm -rf build/* dist/*
 
 pdf: latex
 	cd build/latex && make all-pdf
 
 all: html pdf
 
-dist: all
+dist: clean all
 	mkdir -p dist
-	-rm -rf dist/*
-	ln build/latex/IPython.pdf dist/
+	ln build/latex/ipython.pdf dist/
 	cp -al build/html dist/
 	@echo "Build finished.  Final docs are in dist/"
 

docs/source/changes.txt

@@ -27,6 +27,11 b' Release 0.9'
 New features
 ------------
 
+* Laurent's WX application has been given a top-level script called ipython-wx,
+  and it has received numerous fixes.  We expect this code to be
+  architecturally better integrated with Gael's WX 'ipython widget' over the
+  next few releases.
+
 * The Editor synchronization work by Vivian De Smedt has been merged in.  This
   code adds a number of new editor hooks to synchronize with editors under
   Windows.

docs/source/conf.py

@@ -150,11 +150,11 b" latex_font_size = '11pt'"
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 
-latex_documents = [ ('index', 'IPython.tex', 'IPython Documentation',
+latex_documents = [ ('index', 'ipython.tex', 'IPython Documentation',
                      ur"""Brian Granger, Fernando Pérez and Ville Vainio\\
                      \ \\
                      With contributions from:\\
-                     Benjamin Ragan-Kelley.""",
+                     Benjamin Ragan-Kelley and Barry Wark.""",
                      'manual'),
                     ]
 

scripts/ipython_win_post_install.py

@@ -38,9 +38,9 b' def install():'
         import readline
     except ImportError:
         print ('To take full advantage of IPython, you need readline from:\n'
-               'http://sourceforge.net/projects/uncpythontools')
+               'https://launchpad.net/pyreadline')
 
-    ipybase = '"'+prefix+r'\scripts\ipython"'
+    ipybase = '"' + prefix + r'\scripts\ipython"'
     # Create IPython entry ...
     if not os.path.isdir(ip_dir):
         os.mkdir(ip_dir)
@@ -53,18 +53,22 b' def install():'
 
     f = ip_dir + r'\pysh.lnk'
     a = ipybase+' -p sh'
-    mkshortcut(python,'IPython command prompt mode',f,a)
+    mkshortcut(python,'IPython (command prompt mode)',f,a)
+
+    f = ip_dir + r'\pylab.lnk'
+    a = ipybase+' -pylab'
+    mkshortcut(python,'IPython (PyLab mode)',f,a)
 
     f = ip_dir + r'\scipy.lnk'
     a = ipybase+' -pylab -p scipy'
-    mkshortcut(python,'IPython scipy profile',f,a)
+    mkshortcut(python,'IPython (scipy profile)',f,a)
 
-    # Create documentation shortcuts ...    
+    # Create documentation shortcuts ...
     t = prefix + r'\share\doc\ipython\manual\ipython.pdf'
     f = ip_dir + r'\Manual in PDF.lnk'
     mkshortcut(t,r'IPython Manual - PDF-Format',f)
 
-    t = prefix + r'\share\doc\ipython\manual\ipython.html'
+    t = prefix + r'\share\doc\ipython\manual\html\index.html'
     f = ip_dir + r'\Manual in HTML.lnk'
     mkshortcut(t,'IPython Manual - HTML-Format',f)
 

setup.py

@@ -88,28 +88,39 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
                   "cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz"),
                  ]
 
-    # Only build the docs is sphinx is present
+    # Only build the docs if sphinx is present
     try:
         import sphinx
     except ImportError:
         pass
     else:
-        pass
-        # BEG: This is disabled as I am not sure what to depend on.
-        # I actually don't think we should be automatically building
-        # the docs for people.
-        # The do_sphinx scripts builds html and pdf, so just one
-        # target is enough to cover all manual generation
-        # to_update.append(
-        #     ('docs/manual/ipython.pdf',
-        #     ['IPython/Release.py','docs/source/ipython.rst'],
-        #     "cd docs && python do_sphinx.py")
-        # )
+        # The Makefile calls the do_sphinx scripts to build html and pdf, so
+        # just one target is enough to cover all manual generation
+
+        # First, compute all the dependencies that can force us to rebuild the
+        # docs.  Start with the main release file that contains metadata
+        docdeps = ['IPython/Release.py']
+        # Inculde all the reST sources
+        pjoin = os.path.join
+        for dirpath,dirnames,filenames in os.walk('docs/source'):
+            if dirpath in ['_static','_templates']:
+                continue
+            docdeps += [ pjoin(dirpath,f) for f in filenames
+                         if f.endswith('.txt') ]
+        # and the examples
+        for dirpath,dirnames,filenames in os.walk('docs/example'):
+            docdeps += [ pjoin(dirpath,f) for f in filenames
+                         if not f.endswith('~') ]
+        # then, make them all dependencies for the main PDF (the html will get
+        # auto-generated as well).
+        to_update.append(
+            ('docs/dist/ipython.pdf',
+             docdeps,
+             "cd docs && make dist")
+            )
         
     [ target_update(*t) for t in to_update ]
 
-    # Build the docs
-    os.system('cd docs && make dist')
     
 #---------------------------------------------------------------------------
 # Find all the packages, package data, scripts and data_files

setupbase.py

@@ -224,6 +224,7 b' def find_scripts():'
                'IPython/kernel/scripts/ipcluster',
                'scripts/ipython',
                'scripts/ipythonx',
+               'scripts/ipython-wx',
                'scripts/pycolor',
                'scripts/irunner',
                'scripts/iptest',

tools/release

@@ -12,26 +12,6 b' echo "=================================="'
 
 echo "Marking ChangeLog with release information and making NEWS file..."
 
-# Stamp changelog and save a copy of the status at each version, in case later
-# we want the NEWS file to start from a point before the very last release (if
-# very small interim releases have no significant changes).
-
-cd $ipdir/doc
-cp ChangeLog ChangeLog.old
-cp ChangeLog ChangeLog.$version
-daystamp=`date +%Y-%m-%d`
-echo $daystamp " ***" Released version $version > ChangeLog
-echo >> ChangeLog
-cat ChangeLog.old >> ChangeLog
-rm ChangeLog.old
-
-# Build NEWS file
-echo "Changes between the last two releases (major or minor)" > NEWS
-echo "Note that this is an auto-generated diff of the ChangeLogs" >> NEWS
-echo >> NEWS
-diff ChangeLog.previous ChangeLog | grep -v '^0a' | sed 's/^> //g' >> NEWS
-cp ChangeLog ChangeLog.previous
-
 # Clean up build/dist directories
 rm -rf $ipdir/build/*
 rm -rf $ipdir/dist/*
@@ -77,25 +57,4 b' echo "Uploading backup files..."'
 cd $ipbackupdir
 scp `ls -1tr *tgz | tail -1` [e-mail]:www/backup/
 
-echo "Updating webpage..."
-cd $ipdir/doc
-www=~/ipython/homepage
-cp ChangeLog NEWS $www
-rm -rf $www/doc/*
-cp -r manual/ $www/doc
-cd $www
-./update
-
-# Alert package maintainers
-#echo "Alerting package maintainers..."
-#maintainers='[e-mail] [e-mail] [e-mail] [e-mail] [e-mail] [e-mail]'
-# maintainers='[e-mail]'
-
-# for email in $maintainers
-#     do
-# 	echo "Emailing $email..."
-# 	mail -s "[Package maintainer notice] A new IPython is out. Version: $version" \
-#     $email < NEWS
-#     done
-
 echo "Done!"

win32_manual_post_install.py

@@ -72,7 +72,7 b' def run(wait=0):'
     # File and directory names
     ip_dir = program_files_dir + r'\IPython'
     ip_prog_dir = programs_dir + r'\IPython'
-    doc_dir = ip_dir+r'\doc'
+    doc_dir = ip_dir+r'\docs'
     ip_filename = ip_dir+r'\IPython_shell.py'
     pycon_icon = doc_dir+r'\pycon.ico'
 
@@ -83,7 +83,7 b' def run(wait=0):'
     shutil.copy(sys.prefix+r'\Scripts\ipython',ip_filename)
     if os.path.isdir(doc_dir):
         shutil.rmtree(doc_dir)
-    shutil.copytree('doc',doc_dir)
+    shutil.copytree('docs',doc_dir)
 
     # make shortcuts for IPython, html and pdf docs.
     print 'Making entries for IPython in Start Menu...',
@@ -104,8 +104,8 b' def run(wait=0):'
         os.mkdir(ip_prog_dir)
     os.chdir(ip_prog_dir)
 
-    man_pdf = doc_dir + r'\manual\ipython.pdf'
-    man_htm = doc_dir + r'\manual\ipython.html'
+    man_pdf = doc_dir + r'\dist\ipython.pdf'
+    man_htm = doc_dir + r'\dist\index.html'
 
     make_shortcut('IPython.lnk',sys.executable, '"%s"' % ip_filename,
                   my_documents_dir,