Show More
@@ -4,7 +4,7 b'' | |||||
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 1 |
|
7 | $Id: Shell.py 1297 2006-05-13 19:14:48Z 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> | |
@@ -337,7 +337,7 b' class MTInteractiveShell(InteractiveShell):' | |||||
337 | Multithreaded wrapper around IPython's runcode().""" |
|
337 | Multithreaded wrapper around IPython's runcode().""" | |
338 |
|
338 | |||
339 | # lock thread-protected stuff |
|
339 | # lock thread-protected stuff | |
340 | self.thread_ready.acquire(False) |
|
340 | got_lock = self.thread_ready.acquire(False) | |
341 |
|
341 | |||
342 | # Install sigint handler |
|
342 | # Install sigint handler | |
343 | try: |
|
343 | try: | |
@@ -365,7 +365,8 b' class MTInteractiveShell(InteractiveShell):' | |||||
365 | InteractiveShell.runcode(self,code_to_run) |
|
365 | InteractiveShell.runcode(self,code_to_run) | |
366 |
|
366 | |||
367 | # We're done with thread-protected variables |
|
367 | # We're done with thread-protected variables | |
368 | self.thread_ready.release() |
|
368 | if got_lock: | |
|
369 | self.thread_ready.release() | |||
369 | # This MUST return true for gtk threading to work |
|
370 | # This MUST return true for gtk threading to work | |
370 | return True |
|
371 | return True | |
371 |
|
372 |
@@ -1,3 +1,10 b'' | |||||
|
1 | 2006-05-13 Fernando Perez <Fernando.Perez@colorado.edu> | |||
|
2 | ||||
|
3 | * IPython\Shell.py (MTInteractiveShell.runsource): Fix threading | |||
|
4 | bug, closes http://www.scipy.net/roundup/ipython/issue55. A lock | |||
|
5 | was being released in a routine which hadn't checked if it had | |||
|
6 | been the one to acquire it. | |||
|
7 | ||||
1 | 2006-05-07 Fernando Perez <Fernando.Perez@colorado.edu> |
|
8 | 2006-05-07 Fernando Perez <Fernando.Perez@colorado.edu> | |
2 |
|
9 | |||
3 | * IPython/Release.py (version): put out 0.7.2.rc1 for testing. |
|
10 | * IPython/Release.py (version): put out 0.7.2.rc1 for testing. |
General Comments 0
You need to be logged in to leave comments.
Login now