Changeset 6586:700f1f5b718f

Timestamp:

09/30/07 22:28:18 (6 years ago)

Author:

Gonzalo Tornaría <tornaria@…>

Branch:

default

Message:

Fix error in handling of Ctrl-C for expect interfaces (#770).

Location:

sage/interfaces

Files:

• expect.py (modified) (1 diff)
• lisp.py (modified) (1 diff)

sage/interfaces/expect.py

@@ -650 +650 @@
             return '\n'.join([self._eval_line(L, **kwds) for L in code.split('\n') if L != ''])
         except KeyboardInterrupt:
-            self._keyboard_interrupt()
+            # DO NOT CATCH KeyboardInterrupt, as it is being caught
+            # by _eval_line
+            # In particular, do NOT call self._keyboard_interrupt()
+            raise
         except TypeError, s:
             raise TypeError, 'error evaluating "%s":\n%s'%(code,s)

sage/interfaces/lisp.py

@@ -125 +125 @@
                     self.__in_seq = s
                 except KeyboardInterrupt:
-                    self._keyboard_interrupt()
+                    # DO NOT CATCH KeyboardInterrupt, as it is being caught
+                    # by _eval_line
+                    # In particular, do NOT call self._keyboard_interrupt()
+                    raise
                 except TypeError, s:
                     return 'error evaluating "%s":\n%s'%(code,s)