From 31385bf2db09a95618a6e535546abd02a451e293 Mon Sep 17 00:00:00 2001
From: David Hughes <dfh@forestfield.co.uk>
Date: Wed, 29 Mar 2017 11:43:33 +0100
Subject: [PATCH] Occurrences of PyDeadObjectError replaced by RuntimeError

---
 wx/lib/agw/persist/persistencemanager.py | 2 +-
 wx/lib/eventStack.py                     | 4 ++--
 wx/lib/evtmgr.py                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wx/lib/agw/persist/persistencemanager.py b/wx/lib/agw/persist/persistencemanager.py
index f17b1a17..a787d4eb 100644
--- a/wx/lib/agw/persist/persistencemanager.py
+++ b/wx/lib/agw/persist/persistencemanager.py
@@ -443,7 +443,7 @@ class PersistenceManager(object):
         """
 
         if window:
-            # protect for PyDeadObjectError
+            # protect for RuntimeError
             if window.GetName() in self._persistentObjects:
                 return window
 
diff --git a/wx/lib/eventStack.py b/wx/lib/eventStack.py
index 29026521..1e4f4e06 100644
--- a/wx/lib/eventStack.py
+++ b/wx/lib/eventStack.py
@@ -114,7 +114,7 @@ class AppEventHandlerMixin:
             try:
                 if handler:
                     return handler(event)
-            except wx.PyDeadObjectError:
+            except RuntimeError:
                 self.RemoveHandlerForID(e_id)
         else:
             event.Skip()
@@ -128,7 +128,7 @@ class AppEventHandlerMixin:
             try:
                 if handler:
                     return handler(event)
-            except wx.PyDeadObjectError:
+            except RuntimeError:
                 self.RemoveUIHandlerForID(e_id)
         else:
             event.Skip()
diff --git a/wx/lib/evtmgr.py b/wx/lib/evtmgr.py
index 35847f96..84446a53 100644
--- a/wx/lib/evtmgr.py
+++ b/wx/lib/evtmgr.py
@@ -222,7 +222,7 @@ class EventManager:
             name = aWin.GetClassName()
             i    = id(aWin)
             return '%s #%d' % (name, i)
-        except wx.PyDeadObjectError:
+        except RuntimeError:
             return '(dead wx.Object)'