[CalendarServer-changes] [1872] CalendarClientSimulator/trunk/src/calendarclient.py

[source_changes at macosforge.org]

Revision: 1872
          http://trac.macosforge.org/projects/calendarserver/changeset/1872
Author:   cdaboo at apple.com
Date:     2007-09-13 12:09:26 -0700 (Thu, 13 Sep 2007)

Log Message:
-----------
Missing return's in excepts.

Modified Paths:
--------------
    CalendarClientSimulator/trunk/src/calendarclient.py

Modified: CalendarClientSimulator/trunk/src/calendarclient.py
===================================================================
--- CalendarClientSimulator/trunk/src/calendarclient.py	2007-09-13 18:52:08 UTC (rev 1871)
+++ CalendarClientSimulator/trunk/src/calendarclient.py	2007-09-13 19:09:26 UTC (rev 1872)
@@ -261,6 +261,7 @@
                 return
         except Exception, e:
             self.log("Polling: %s exception: %s" % (self.user, e,))
+            return
             
         # Parse the XML to find changed ctags
         changed = []
@@ -414,11 +415,17 @@
                 return
         except Exception, e:
             self.log("Event write failed with exception: %s for user: %s" % (e, self.user,))
+            return
         
-        status, headers, data = self.doRequest(uri, "GET")
-        if status != 200:
-            self.log("Event read failed with status: %d for user: %s" % (status, self.user,))
+        try:
+            status, headers, data = self.doRequest(uri, "GET")
+            if status != 200:
+                self.log("Event read failed with status: %d for user: %s" % (status, self.user,))
+                return
+        except Exception, e:
+            self.log("Event read failed with exception: %s for user: %s" % (e, self.user,))
             return
+
         for header, value in headers:
             if header == "etag":
                 etag = unq(value)
@@ -439,6 +446,7 @@
                 return None
         except Exception, e:
             self.log("Event read of %s failed with exception: %s for user: %s" % (uri, e, self.user,))
+            return None
 
         return data
 
@@ -579,6 +587,7 @@
                 return None
         except Exception, e:
             self.log("Polling failed with exception: %s for user: %s" % (e, self.user,))
+            return None
 
         # Parse the XML to find etags
         hrefs = {}
@@ -608,6 +617,7 @@
                 return
         except Exception, e:
             self.log("Polling failed with exception: %s for user: %s" % (e, self.user,))
+            return
 
         # Parse the XML to find etags
         results = {}
@@ -640,6 +650,7 @@
                 return
         except Exception, e:
             self.log("POST failed with exception: %s for user: %s" % (e, self.user,))
+            return
             
         # Parse the XML to find etags
         results = {}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070913/871e54f9/attachment.html