[CalendarServer-changes] [13817] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Aug 1 10:40:13 PDT 2014


Revision: 13817
          http://trac.calendarserver.org//changeset/13817
Author:   cdaboo at apple.com
Date:     2014-08-01 10:40:13 -0700 (Fri, 01 Aug 2014)
Log Message:
-----------
Whitespace.

Modified Paths:
--------------
    CalDAVTester/trunk/odsetup.py
    CalDAVTester/trunk/src/caldavtest.py
    CalDAVTester/trunk/src/request.py
    CalDAVTester/trunk/src/unittest/test_jsonPointer.py
    CalDAVTester/trunk/verifiers/freeBusy.py
    CalDAVTester/trunk/verifiers/postFreeBusy.py
    CalDAVTester/trunk/verifiers/propfindItems.py
    CalDAVTester/trunk/verifiers/propfindValues.py

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/odsetup.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -227,7 +227,7 @@
 }
 
 groupattrs = {
-        "dsAttrTypeStandard:RealName": "Group %02d",
+    "dsAttrTypeStandard:RealName": "Group %02d",
 }
 
 records = (
@@ -542,7 +542,8 @@
     if user[0] in guids:
         guids[user[0]] = guid
     if path == "/Places":
-        cmd(cmdutility,
+        cmd(
+            cmdutility,
             locationcreatecmd % {
                 "guid": guid,
                 "realname": user[2]["dsAttrTypeStandard:RealName"],
@@ -550,7 +551,8 @@
             }
         )
     elif path == "/Resources":
-        cmd(cmdutility,
+        cmd(
+            cmdutility,
             resourcecreatecmd % {
                 "guid": guid,
                 "realname": user[2]["dsAttrTypeStandard:RealName"],
@@ -585,14 +587,16 @@
         if user[0] not in locations:
             return
         guid = locations[user[0]]
-        cmd(cmdutility,
+        cmd(
+            cmdutility,
             locationremovecmd % {"guid": guid, }
         )
     elif path == "/Resources":
         if user[0] not in resources:
             return
         guid = resources[user[0]]
-        cmd(cmdutility,
+        cmd(
+            cmdutility,
             resourceremovecmd % {"guid": guid, }
         )
     else:

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/src/caldavtest.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -566,8 +566,10 @@
 
         # Special for GETCHANGED
         if req.method == "GETCHANGED":
-            if not self.dowaitchanged(uri, etags[uri], req.user, req.pswd,
-                label=label):
+            if not self.dowaitchanged(
+                uri, etags[uri], req.user, req.pswd,
+                label=label
+            ):
                 return False, "Resource did not change", None, None
             method = "GET"
 
@@ -578,7 +580,7 @@
         # Do the http request
         http = SmartHTTPConnection(req.host, req.port, self.manager.server_info.ssl)
 
-        if not 'User-Agent' in headers and label is not None:
+        if 'User-Agent' not in headers and label is not None:
             headers['User-Agent'] = label.encode("utf-8")
 
         try:

Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/src/request.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -265,13 +265,19 @@
             )
 
             if details.get('qop'):
-                response = ('Digest username="%s", realm="%s", '
-                        'nonce="%s", uri="%s", '
-                        'response=%s, algorithm=%s, cnonce="%s", qop=%s, nc=%s' % (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'), details.get('cnonce'), details.get('qop'), details.get('nc'),))
+                response = (
+                    'Digest username="%s", realm="%s", '
+                    'nonce="%s", uri="%s", '
+                    'response=%s, algorithm=%s, cnonce="%s", qop=%s, nc=%s' %
+                    (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'), details.get('cnonce'), details.get('qop'), details.get('nc'),)
+                )
             else:
-                response = ('Digest username="%s", realm="%s", '
-                        'nonce="%s", uri="%s", '
-                        'response=%s, algorithm=%s' % (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'),))
+                response = (
+                    'Digest username="%s", realm="%s", '
+                    'nonce="%s", uri="%s", '
+                    'response=%s, algorithm=%s' %
+                    (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'),)
+                )
 
             return response
         else:

Modified: CalDAVTester/trunk/src/unittest/test_jsonPointer.py
===================================================================
--- CalDAVTester/trunk/src/unittest/test_jsonPointer.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/src/unittest/test_jsonPointer.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -206,7 +206,7 @@
             (
                 "/",
                 '{"1":"foo", "2": "bar"}',
-                [{"1":"foo", "2": "bar"}, ],
+                [{"1": "foo", "2": "bar"}, ],
             ),
             (
                 "/.",

Modified: CalDAVTester/trunk/verifiers/freeBusy.py
===================================================================
--- CalDAVTester/trunk/verifiers/freeBusy.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/freeBusy.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -73,9 +73,11 @@
                     raise ValueError("Unknown FBTYPE: %s" % (fbtype,))
 
             # Set sizes must match
-            if ((len(busy) != len(busyp)) or
+            if (
+                (len(busy) != len(busyp)) or
                 (len(unavailable) != len(unavailablep)) or
-                (len(tentative) != len(tentativep))):
+                (len(tentative) != len(tentativep))
+            ):
                 raise ValueError("Period list sizes do not match.")
 
             # Convert to string sets

Modified: CalDAVTester/trunk/verifiers/postFreeBusy.py
===================================================================
--- CalDAVTester/trunk/verifiers/postFreeBusy.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/postFreeBusy.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -61,7 +61,7 @@
                 # Must be VFREEBUSY
                 fb = comps[0]
 
-                    # Check for attendee value
+                # Check for attendee value
                 for attendee in fb.getProperties("ATTENDEE"):
                     if attendee.getValue().getValue() in users:
                         users.remove(attendee.getValue().getValue())
@@ -92,9 +92,11 @@
                         raise ValueError("Unknown FBTYPE: %s" % (fbtype,))
 
                 # Set sizes must match
-                if ((len(busy) != len(busyp)) or
+                if (
+                    (len(busy) != len(busyp)) or
                     (len(unavailable) != len(unavailablep)) or
-                    (len(tentative) != len(tentativep))):
+                    (len(tentative) != len(tentativep))
+                ):
                     raise ValueError("Period list sizes do not match.")
 
                 # Convert to string sets

Modified: CalDAVTester/trunk/verifiers/propfindItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/propfindItems.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/propfindItems.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -80,12 +80,12 @@
         for i in range(len(okprops)):
             p = okprops[i]
             if (p.find("$") != -1):
-                if  p.find("$") != len(p) - 1:
+                if p.find("$") != len(p) - 1:
                     ok_props_match.append((p.split("$")[0], normalizeXML(p.split("$")[1])))
                 else:
                     ok_props_match.append((p.split("$")[0], None))
             elif (p.find("!") != -1):
-                if  p.find("!") != len(p) - 1:
+                if p.find("!") != len(p) - 1:
                     okprops_nomatch[p.split("!")[0]] = normalizeXML(p.split("!")[1])
                 else:
                     okprops_nomatch[p.split("!")[0]] = None

Modified: CalDAVTester/trunk/verifiers/propfindValues.py
===================================================================
--- CalDAVTester/trunk/verifiers/propfindValues.py	2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/propfindValues.py	2014-08-01 17:40:13 UTC (rev 13817)
@@ -52,7 +52,7 @@
                 else:
                     props_match.append((p.split("$")[0], "", True))
             elif (p.find("!") != -1):
-                if  p.find("!") != len(p) - 1:
+                if p.find("!") != len(p) - 1:
                     props_match.append((p.split("!")[0], normalizeXML(p.split("!")[1]), False))
                 else:
                     props_match.append((p.split("!")[0], "", False))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140801/c5902705/attachment-0001.html>


More information about the calendarserver-changes mailing list