Fix GTK timer/idle problems, finally.

IPython/Release.py

@@ -1,7 +1,7 b''
 # -*- coding: utf-8 -*-
 """Release data for the IPython project.
 
-$Id: Release.py 1000 2006-01-10 08:06:04Z fperez $"""
+$Id: Release.py 1002 2006-01-11 22:18:29Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez <[e-mail]>
@@ -22,9 +22,9 b" name = 'ipython'"
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
-version = '0.7.0'
+version = '0.7.1.svn'
 
-revision = '$Revision: 1000 $'
+revision = '$Revision: 1002 $'
 
 description = "An enhanced interactive Python shell."
 

IPython/Shell.py

@@ -4,7 +4,7 b''
 All the matplotlib support code was co-developed with John Hunter,
 matplotlib's author.
 
-$Id: Shell.py 998 2006-01-09 06:57:40Z fperez $"""
+$Id: Shell.py 1002 2006-01-11 22:18:29Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez <[e-mail]>
@@ -23,6 +23,7 b' import __builtin__'
 import os
 import sys
 import signal
+import time
 import threading
 
 import IPython
@@ -625,9 +626,9 b' class IPShellGTK(threading.Thread):'
         
         if self.gtk.pygtk_version >= (2,4,0):
             import gobject
-            gobject.timeout_add(self.TIMEOUT, self.on_timer)
+            gobject.idle_add(self.on_timer)
         else:
-            self.gtk.timeout_add(self.TIMEOUT, self.on_timer)
+            self.gtk.idle_add(self.on_timer)
 
         if sys.platform != 'win32':
             try:
@@ -652,9 +653,14 b' class IPShellGTK(threading.Thread):'
         self.join()
 
     def on_timer(self):
-        update_tk(self.tk)
-        return self.IP.runcode()
+        """Called when GTK is idle.
+
+        Must return True always, otherwise GTK stops calling it"""
         
+        update_tk(self.tk)
+        self.IP.runcode()
+        time.sleep(0.01)
+        return True
 
 class IPShellWX(threading.Thread):
     """Run a wx mainloop() in a separate thread.

IPython/iplib.py

@@ -6,7 +6,7 b' Requires Python 2.1 or newer.'
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 1000 2006-01-10 08:06:04Z fperez $
+$Id: iplib.py 1002 2006-01-11 22:18:29Z fperez $
 """
 
 #*****************************************************************************
@@ -1177,9 +1177,9 b' want to merge them back into the new files.""" % locals()'
 
     def _should_recompile(self,e):
         """Utility routine for edit_syntax_error"""
-        
+
         if e.filename in ('<ipython console>','<input>','<string>',
-                          '<console>'):
+                          '<console>',None):
             return False
         try:
             if not ask_yes_no('Return to editor to correct syntax error? '

doc/ChangeLog

@@ -1,3 +1,11 b''
[phone]  Fernando Perez  <[e-mail]>
+
+	* IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the
+	problem of excessive CPU usage under *nix and keyboard lag under
+	win32.
+
[phone]  *** Released version 0.7.0
+
 2006-01-10  Fernando Perez  <[e-mail]>
 
 	* IPython/Release.py (revision): tag version number to 0.7.0,

doc/manual_base.lyx

@@ -2474,9 +2474,6 b' all'
 %save
 \family default 
  allows you to select which lines of input you need to save.
-\layout Standard
-
-And 
 \layout Subsection
 
 Effective logging

tools/release

@@ -73,11 +73,11 b' cd $ipdir'
 # Upload all files
 cd $ipdir/dist
 echo "Uploading distribution files..."
-scp * [e-mail]:www/dist/
+scp * [e-mail]:www/dist/
 
 echo "Uploading backup files..."
 cd ~/ipython/backup
-scp `ls -1tr | tail -1` [e-mail]:www/backup/
+scp `ls -1tr | tail -1` [e-mail]:www/backup/
 
 echo "Updating webpage..."
 cd $ipdir/doc