##// END OF EJS Templates
Fix GTK timer/idle problems, finally.
fperez -
r95:6bf9e3b7
parent child
Show More
@@ -1,7 +1,7
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Release data for the IPython project.
2 """Release data for the IPython project.
3
3
4 $Id: Release.py 1000 2006-01-10 08:06:04Z fperez $"""
4 $Id: Release.py 1002 2006-01-11 22:18:29Z fperez $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -22,9 +22,9 name = 'ipython'
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
23 # bdist_deb does not accept underscores (a Debian convention).
23 # bdist_deb does not accept underscores (a Debian convention).
24
24
25 version = '0.7.0'
25 version = '0.7.1.svn'
26
26
27 revision = '$Revision: 1000 $'
27 revision = '$Revision: 1002 $'
28
28
29 description = "An enhanced interactive Python shell."
29 description = "An enhanced interactive Python shell."
30
30
@@ -4,7 +4,7
4 All the matplotlib support code was co-developed with John Hunter,
4 All the matplotlib support code was co-developed with John Hunter,
5 matplotlib's author.
5 matplotlib's author.
6
6
7 $Id: Shell.py 998 2006-01-09 06:57:40Z fperez $"""
7 $Id: Shell.py 1002 2006-01-11 22:18:29Z fperez $"""
8
8
9 #*****************************************************************************
9 #*****************************************************************************
10 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
10 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -23,6 +23,7 import __builtin__
23 import os
23 import os
24 import sys
24 import sys
25 import signal
25 import signal
26 import time
26 import threading
27 import threading
27
28
28 import IPython
29 import IPython
@@ -625,9 +626,9 class IPShellGTK(threading.Thread):
625
626
626 if self.gtk.pygtk_version >= (2,4,0):
627 if self.gtk.pygtk_version >= (2,4,0):
627 import gobject
628 import gobject
628 gobject.timeout_add(self.TIMEOUT, self.on_timer)
629 gobject.idle_add(self.on_timer)
629 else:
630 else:
630 self.gtk.timeout_add(self.TIMEOUT, self.on_timer)
631 self.gtk.idle_add(self.on_timer)
631
632
632 if sys.platform != 'win32':
633 if sys.platform != 'win32':
633 try:
634 try:
@@ -652,9 +653,14 class IPShellGTK(threading.Thread):
652 self.join()
653 self.join()
653
654
654 def on_timer(self):
655 def on_timer(self):
655 update_tk(self.tk)
656 """Called when GTK is idle.
656 return self.IP.runcode()
657
658 Must return True always, otherwise GTK stops calling it"""
657
659
660 update_tk(self.tk)
661 self.IP.runcode()
662 time.sleep(0.01)
663 return True
658
664
659 class IPShellWX(threading.Thread):
665 class IPShellWX(threading.Thread):
660 """Run a wx mainloop() in a separate thread.
666 """Run a wx mainloop() in a separate thread.
@@ -6,7 +6,7 Requires Python 2.1 or newer.
6
6
7 This file contains all the classes and helper functions specific to IPython.
7 This file contains all the classes and helper functions specific to IPython.
8
8
9 $Id: iplib.py 1000 2006-01-10 08:06:04Z fperez $
9 $Id: iplib.py 1002 2006-01-11 22:18:29Z fperez $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -1177,9 +1177,9 want to merge them back into the new files.""" % locals()
1177
1177
1178 def _should_recompile(self,e):
1178 def _should_recompile(self,e):
1179 """Utility routine for edit_syntax_error"""
1179 """Utility routine for edit_syntax_error"""
1180
1180
1181 if e.filename in ('<ipython console>','<input>','<string>',
1181 if e.filename in ('<ipython console>','<input>','<string>',
1182 '<console>'):
1182 '<console>',None):
1183 return False
1183 return False
1184 try:
1184 try:
1185 if not ask_yes_no('Return to editor to correct syntax error? '
1185 if not ask_yes_no('Return to editor to correct syntax error? '
@@ -1,3 +1,11
1 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
2
3 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the
4 problem of excessive CPU usage under *nix and keyboard lag under
5 win32.
6
7 2006-01-10 *** Released version 0.7.0
8
1 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
9 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
2
10
3 * IPython/Release.py (revision): tag version number to 0.7.0,
11 * IPython/Release.py (revision): tag version number to 0.7.0,
@@ -2474,9 +2474,6 all
2474 %save
2474 %save
2475 \family default
2475 \family default
2476 allows you to select which lines of input you need to save.
2476 allows you to select which lines of input you need to save.
2477 \layout Standard
2478
2479 And
2480 \layout Subsection
2477 \layout Subsection
2481
2478
2482 Effective logging
2479 Effective logging
@@ -73,11 +73,11 cd $ipdir
73 # Upload all files
73 # Upload all files
74 cd $ipdir/dist
74 cd $ipdir/dist
75 echo "Uploading distribution files..."
75 echo "Uploading distribution files..."
76 scp * fperez@scipy.org:www/dist/
76 scp * ipython@ipython.scipy.org:www/dist/
77
77
78 echo "Uploading backup files..."
78 echo "Uploading backup files..."
79 cd ~/ipython/backup
79 cd ~/ipython/backup
80 scp `ls -1tr | tail -1` fperez@scipy.org:www/backup/
80 scp `ls -1tr | tail -1` ipython@ipython.scipy.org:www/backup/
81
81
82 echo "Updating webpage..."
82 echo "Updating webpage..."
83 cd $ipdir/doc
83 cd $ipdir/doc
General Comments 0
You need to be logged in to leave comments. Login now