Commit 4269601f authored by Guido van Rossum's avatar Guido van Rossum

Amazing. A very subtle change in policy in descr-branch actually

found a bug here.  Here's the deal:

Class PyShell derives from class OutputWindow.  Method PyShell.close()
wants to invoke its parent method, but because PyShell long ago was
inherited from class PyShellEditorWindow, it invokes
PyShelEditorWindow.close(self).  Now, class PyShellEditorWindow itself
derives from class OutputWindow, and inherits the close() method from
there without overriding it.  Under the old rules,
PyShellEditorWindow.close would return an unbound method restricted to
the class that defined the implementation of close(), which was
OutputWindow.close.  Under the new rules, the unbound method is
restricted to the class whose method was requested, that is
PyShellEditorWindow, and this was correctly trapped as an error.
parent ab1df4fe
......@@ -418,7 +418,7 @@ class PyShell(OutputWindow):
if self.reading:
self.top.quit()
return "cancel"
return PyShellEditorWindow.close(self)
return OutputWindow.close(self)
def _close(self):
self.close_debugger()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment