Attachment 383696 Details for Bug 632144

[patch] Strongwind patch.

ipc-fixes.patch (text/plain), 4.18 KB, created by Michael Gorse on 2010-08-18 09:02:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gorse

Created: 2010-08-18 09:02:29 UTC

Size: 4.18 KB

patch

obsolete

>diff --git a/strongwind/accessibles.py b/strongwind/accessibles.py
>index a34eb55..f0be0d2 100644
>--- a/strongwind/accessibles.py
>+++ b/strongwind/accessibles.py
>@@ -752,12 +752,15 @@ class Frame(Accessible):
>     def assertClosed(self):
>         'Raise an exception if the window is still open'
> 
>-        procedurelogger.expectedResult('The %s disappears.' % self)
>+        try:
>+            procedurelogger.expectedResult('The %s disappears.' % self)
>+        except errors.IPCError:
>+            procedurelogger.expectedResult('The frame disappears.')
> 
>         def closed():
>             try:
>                 return not self.showing
>-            except (LookupError, KeyError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+            except (LookupError, KeyError, errors.IPCError):
>                 return True
> 
>         assert utils.retryUntilTrue(closed)
>@@ -810,7 +813,7 @@ class Dialog(Accessible):
>         def closed():
>             try:
>                 return not self.showing
>-            except (LookupError, KeyError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+            except (LookupError, KeyError, errors.IPCError):
>                 return True
> 
>         assert utils.retryUntilTrue(closed)
>@@ -865,7 +868,7 @@ class Alert(Accessible):
>         def closed():
>             try:
>                 return not self.showing
>-            except (LookupError, KeyError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+            except (LookupError, KeyError, errors.IPCError):
>                 return True
> 
>         assert utils.retryUntilTrue(closed)
>diff --git a/strongwind/cache.py b/strongwind/cache.py
>index 67dbaac..1052a79 100644
>--- a/strongwind/cache.py
>+++ b/strongwind/cache.py
>@@ -141,7 +141,7 @@ def getApplicationById(id):
>         try:
>             # poke the application first to make sure it's not stale
>             _applications[id]._accessible.id
>-        except (LookupError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+        except (LookupError, errors.IPCError):
>             del _applications[id]
> 
>     return _applications[id]
>@@ -159,7 +159,7 @@ def getApplicationsList():
>         try:
>             # poke each application in the cache and remove stale applications
>             v._accessible.id
>-        except (LookupError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+        except (LookupError, errors.IPCError):
>             del _applications[k]
> 
>     return _applications.values()
>@@ -269,7 +269,7 @@ def launchApplication(args=[], name=None, find=None, cwd=None, env=None, wait=co
>             try:
>                 if existingApp is None or existingApp.id < app.id:
>                     return app
>-            except (LookupError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+            except (LookupError, errors.IPCError):
>                 return app
>             sleep(config.RETRY_INTERVAL)
> 
>diff --git a/strongwind/errors.py b/strongwind/errors.py
>index 3f1b341..750f1c5 100644
>--- a/strongwind/errors.py
>+++ b/strongwind/errors.py
>@@ -27,3 +27,8 @@ class NotSensitiveError(Exception):
>     'Raised when an action cannot be performed because the widget is insensitive'
>     pass
> 
>+try:
>+    IPCError = pyatspi.ORBit.CORBA.COMM_FAILURE
>+except:
>+    import dbus
>+    IPCError = dbus.exceptions.DBusException
>diff --git a/strongwind/procedurelogger.py b/strongwind/procedurelogger.py
>index eb0b0e2..2a50d5c 100644
>--- a/strongwind/procedurelogger.py
>+++ b/strongwind/procedurelogger.py
>@@ -67,6 +67,7 @@ import pyatspi
> 
> import config
> import cache
>+import errors
> import utils
> import watchdog
> 
>@@ -158,7 +159,7 @@ def action(action, child=None):
>                                 return False
>                         else:
>                             return False
>-            except (LookupError, KeyError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+            except (LookupError, KeyError, errors.IPCError):
>                 pass
>             return True
> 
>@@ -174,7 +175,7 @@ def action(action, child=None):
>             try:
>                 if old.id != new.id:
>                     application = cache.getApplicationById(new.id)
>-            except (LookupError, KeyError, pyatspi.ORBit.CORBA.COMM_FAILURE):
>+            except (LookupError, KeyError, errors.IPCError):
>                 application = cache.getApplicationById(new.id)
> 
>         #container

Actions: View | Diff

Attachments on bug 632144: 383696