accerciser r563 - in trunk/macaroon: . macaroon/playback

[wwalker svn gnome org]

Author: wwalker
Date: Thu Apr 24 18:36:33 2008
New Revision: 563
URL: http://svn.gnome.org/viewvc/accerciser?rev=563&view=rev

Log:
Bug #529442 - allow frame name to be treated as a regular expression.


Modified:
   trunk/macaroon/ChangeLog
   trunk/macaroon/macaroon/playback/wait_actions.py

Modified: trunk/macaroon/macaroon/playback/wait_actions.py
==============================================================================
--- trunk/macaroon/macaroon/playback/wait_actions.py	(original)
+++ trunk/macaroon/macaroon/playback/wait_actions.py	Thu Apr 24 18:36:33 2008
@@ -15,6 +15,8 @@
 Headers in this file shall remain intact.
 '''
 
+import re
+
 from sequence_step import SequenceStep
 import utils, pyatspi, gobject, sys
 _ = lambda x: x
@@ -193,7 +195,9 @@
     @return: True if this is the right frame.
     @rtype: boolean
     '''
-    return acc is not None and acc.name == self._frame_re
+    return acc is not None and \
+      (acc.name == self._frame_re or \
+      re.compile(self._frame_re and self._frame_re or "").match(acc.name))
 
   def __str__(self):
     '''