##// END OF EJS Templates
Fix gtk threading bug
fperez -
r87:b97379f0
parent child
Show More
@@ -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 965 2005-12-28 23:23:09Z fperez $"""
7 $Id: Shell.py 993 2006-01-04 19:51:01Z fperez $"""
8
8
9 #*****************************************************************************
9 #*****************************************************************************
10 # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu>
10 # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu>
@@ -625,9 +625,9 class IPShellGTK(threading.Thread):
625
625
626 if self.gtk.pygtk_version >= (2,4,0):
626 if self.gtk.pygtk_version >= (2,4,0):
627 import gobject
627 import gobject
628 gobject.idle_add(self.on_timer)
628 gobject.timeout_add(self.TIMEOUT, self.on_timer)
629 else:
629 else:
630 self.gtk.idle_add(self.on_timer)
630 self.gtk.timeout_add(self.TIMEOUT, self.on_timer)
631
631
632 if sys.platform != 'win32':
632 if sys.platform != 'win32':
633 try:
633 try:
@@ -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 990 2006-01-04 06:59:02Z fperez $
9 $Id: iplib.py 993 2006-01-04 19:51:01Z fperez $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -472,7 +472,7 class InteractiveShell(object,Magic):
472 # RegExp to identify potential function names
472 # RegExp to identify potential function names
473 self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
473 self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
474 # RegExp to exclude strings with this start from autocalling
474 # RegExp to exclude strings with this start from autocalling
475 self.re_exclude_auto = re.compile('^[!=()\[\]<>,\*/\+-]|^is ')
475 self.re_exclude_auto = re.compile('^[!=()<>,\*/\+-]|^is ')
476
476
477 # try to catch also methods for stuff in lists/tuples/dicts: off
477 # try to catch also methods for stuff in lists/tuples/dicts: off
478 # (experimental). For this to work, the line_split regexp would need
478 # (experimental). For this to work, the line_split regexp would need
@@ -1942,9 +1942,9 want to merge them back into the new files.""" % locals()
1942 # We only apply it to argument-less calls if the autocall
1942 # We only apply it to argument-less calls if the autocall
1943 # parameter is set to 2. We only need to check that autocall is <
1943 # parameter is set to 2. We only need to check that autocall is <
1944 # 2, since this function isn't called unless it's at least 1.
1944 # 2, since this function isn't called unless it's at least 1.
1945 if not theRest and self.rc.autocall < 2:
1945 if not theRest and (self.rc.autocall < 2):
1946 newcmd = '%s %s' % (iFun,theRest)
1946 newcmd = '%s %s' % (iFun,theRest)
1947 auto_rewrite = False
1947 auto_rewrite = False
1948 else:
1948 else:
1949 if theRest.startswith('['):
1949 if theRest.startswith('['):
1950 if hasattr(obj,'__getitem__'):
1950 if hasattr(obj,'__getitem__'):
@@ -1,5 +1,13
1 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
1 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
2
2
3 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
4 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
5 Moad for help with tracking it down.
6
7 * IPython/iplib.py (handle_auto): fix autocall handling for
8 objects which support BOTH __getitem__ and __call__ (so that f [x]
9 is left alone, instead of becoming f([x]) automatically).
10
3 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
11 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
4 Ville's patch.
12 Ville's patch.
5
13
General Comments 0
You need to be logged in to leave comments. Login now