Squash exception on exit bug

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_app_ex.py b/wxPython/src/_app_ex.py
index 98b35efc212a94eec07311750638d9c861e384f3..f08eef9f41b403e1d0dbcf5562db48ddae066af0 100644 (file)
--- a/wxPython/src/_app_ex.py
+++ b/wxPython/src/_app_ex.py
@@ -173,11 +173,9 @@ your Mac."""
         self._BootstrapApp()
 
 
-    def __del__(self):
-        try:
-            self.RestoreStdio()  # Just in case the MainLoop was overridden
-        finally:
-            wx.PyApp.__del__(self)
+    def __del__(self, destroy=wx.PyApp.__del__):
+        self.RestoreStdio()  # Just in case the MainLoop was overridden
+        destroy(self)
 
     def Destroy(self):
         wx.PyApp.Destroy(self)
@@ -206,7 +204,10 @@ your Mac."""
 
 
     def RestoreStdio(self):
-        _sys.stdout, _sys.stderr = self.saveStdio
+        try:
+            _sys.stdout, _sys.stderr = self.saveStdio
+        except:
+            pass
 
 
     def SetOutputWindowAttributes(self, title=None, pos=None, size=None):