strongwind r30 - in trunk: . strongwind

[bgmerrell svn gnome org]

Author: bgmerrell
Date: Tue Apr  7 21:53:08 2009
New Revision: 30
URL: http://svn.gnome.org/viewvc/strongwind?rev=30&view=rev

Log:
* strongwind/accessibles.py: No longer cache the log name as the
accessible's name when Strongwind can't find a cached log name.
Instead, return the accessible's name property when the cached log name
cannot be found. This fix will avoid the logName being outdate if
an accessible changes its name.  (#577761)
* strongwind/watchdog.py: Simply refer to the AttributeError exception
as AttributeError instead of exceptions.AttributeError.  Exceptions are
provided in the built-in namespace. (#574965)


Modified:
   trunk/ChangeLog
   trunk/strongwind/accessibles.py
   trunk/strongwind/watchdog.py

Modified: trunk/strongwind/accessibles.py
==============================================================================
--- trunk/strongwind/accessibles.py	(original)
+++ trunk/strongwind/accessibles.py	Tue Apr  7 21:53:08 2009
@@ -95,9 +95,9 @@
         elif attr == 'name':
             return self._accessible.name
         elif attr == 'logName':
-            if not self.__dict__.has_key('logName'):
-                self.__dict__['logName'] = self._accessible.name
-            return self.__dict__['logName']
+            if self.__dict__.has_key('logName'):
+                return self.__dict__['logName']
+            return self._accessible.name
         elif attr == 'description':
             return self._accessible.description
         elif attr == 'parent':

Modified: trunk/strongwind/watchdog.py
==============================================================================
--- trunk/strongwind/watchdog.py	(original)
+++ trunk/strongwind/watchdog.py	Tue Apr  7 21:53:08 2009
@@ -133,7 +133,7 @@
         # so try-catch the next statement and abort if we get an AttributeError
         try:
             _terminateLock.acquire()
-        except exceptions.AttributeError:
+        except AttributeError:
             return
 
         _counterLock.acquire()