wait.. fix

Author: kasemir

scan/client/scanclient.py

@@ -375,6 +375,13 @@ def scanDevices(self, scanID=-1):
         xml = perform_request(url)
         return xml
 
+    def __getInfo(self, scanID):
+        """Keep getting scan info while disconnected/timed out"""
+        while True:
+            try:
+                return self.scanInfo(scanID)
+            except:
+                time.sleep(1)
 
     def waitUntilDone(self, scanID):
         """Wait until scan finishes.
@@ -396,14 +403,11 @@ def waitUntilDone(self, scanID):
         :raise Exception: If scan was aborted or failed. 
         """
         while True:
-            try:
-                info = self.scanInfo(scanID)
-                if info.state in ( 'Aborted', 'Failed' ):
-                    raise Exception(str(info))
-                if info.isDone():
-                    return info
-            except:
-                pass
+            info = self.__getInfo(scanID)
+            if info.state in ( 'Aborted', 'Failed' ):
+                raise Exception(str(info))
+            if info.isDone():
+                return info
             time.sleep(1)
 
 

scan/version.py

@@ -1,7 +1,8 @@
 
-__version__ = '1.5.5'
+__version__ = '1.5.6'
 
 version_history = """
+1.5.6 - wait..() fix
 1.5.5 - scanInfo() time out
 1.5.4 - Add '!=' to If() and Wait()
 1.5.3 - Fix 'id' vs. 'scanID' in patch()