Merge branch 'gkuegler-master' into 'master'

Resolves dictation-toolbox#390.

Author: drmfinlay

dragonfly/windows/base_clipboard.py

@@ -163,7 +163,8 @@ def synchronized_changes(cls, timeout, step=0.001, formats=None,
         """
             Context manager for synchronizing local and system clipboard
             changes.  This takes the same arguments as the
-            :meth:`wait_for_change` method.
+            :meth:`wait_for_change` method.  A ``RuntimeError`` is raised if
+            the system clipboard does not change.
 
             Arguments:
              - *timeout* (float) -- timeout in seconds.
@@ -197,8 +198,13 @@ def synchronized_changes(cls, timeout, step=0.001, formats=None,
             # Yield for clipboard operations.
             yield
         finally:
-            # Wait for the system clipboard to change.
-            cls.wait_for_change(timeout, step, formats, initial_clipboard)
+            # Wait for the system clipboard to change, raising an error on
+            #  failure.
+            changed = cls.wait_for_change(timeout, step, formats,
+                                          initial_clipboard)
+            if not changed:
+                message = "Timed out waiting for clipboard to change"
+                raise RuntimeError(message)
 
     #-----------------------------------------------------------------------
 

dragonfly/windows/win32_clipboard.py

@@ -225,9 +225,13 @@ def synchronized_changes(cls, timeout, step=0.001, formats=None,
             # Yield for clipboard operations.
             yield
         finally:
-            # Wait for the system clipboard to change.
-            cls._wait_for_change(timeout, step, formats, initial_clipboard,
-                                 seq_no)
+            # Wait for the system clipboard to change, raising an error on
+            #  failure.
+            changed = cls._wait_for_change(timeout, step, formats,
+                                           initial_clipboard, seq_no)
+            if not changed:
+                message = "Timed out waiting for clipboard to change"
+                raise RuntimeError(message)
 
     #-----------------------------------------------------------------------