[CalendarServer-changes] [14550] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Mar 10 08:21:54 PDT 2015


Revision: 14550
          http://trac.calendarserver.org//changeset/14550
Author:   cdaboo at apple.com
Date:     2015-03-10 08:21:54 -0700 (Tue, 10 Mar 2015)
Log Message:
-----------
Whitespace.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/diagnose.py
    CalendarServer/trunk/calendarserver/tools/importer.py
    CalendarServer/trunk/calendarserver/tools/test/test_principals.py
    CalendarServer/trunk/contrib/od/setup_directory.py
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/test/test_resource.py

Modified: CalendarServer/trunk/calendarserver/tools/diagnose.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/diagnose.py	2015-03-10 14:45:32 UTC (rev 14549)
+++ CalendarServer/trunk/calendarserver/tools/diagnose.py	2015-03-10 15:21:54 UTC (rev 14550)
@@ -358,6 +358,7 @@
     runSQLQuery("select * from job;")
 
 
+
 def showConfigKeys():
 
     print()

Modified: CalendarServer/trunk/calendarserver/tools/importer.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/importer.py	2015-03-10 14:45:32 UTC (rev 14549)
+++ CalendarServer/trunk/calendarserver/tools/importer.py	2015-03-10 15:21:54 UTC (rev 14550)
@@ -82,6 +82,7 @@
     """
 
 
+
 class ImportOptions(Options):
     """
     Command-line options for 'calendarserver_import'
@@ -131,6 +132,7 @@
             return open(self.inputName, 'r')
 
 
+
 # These could probably live on the collection class:
 
 def setCollectionPropertyValue(collection, element, value):
@@ -140,6 +142,7 @@
     )
 
 
+
 def getCollectionPropertyValue(collection, element):
     collectionProperties = collection.properties()
     name = PropertyName.fromElement(element)
@@ -148,7 +151,6 @@
     else:
         return None
 
-#
 
 
 @inlineCallbacks
@@ -286,6 +288,7 @@
             yield txn.commit()
 
 
+
 @inlineCallbacks
 def storeComponentInHomeAndCalendar(
     store, component, homeUID, collectionResourceName, objectResourceName,
@@ -342,7 +345,6 @@
         TimezoneCache.create()
 
 
-
     @inlineCallbacks
     def doWork(self):
         """
@@ -412,6 +414,7 @@
     except UsageError, e:
         usage(e)
 
+
     def makeService(store):
         from twistedcaldav.config import config
         return ImporterService(store, options, reactor, config)

Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py	2015-03-10 14:45:32 UTC (rev 14549)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py	2015-03-10 15:21:54 UTC (rev 14550)
@@ -155,6 +155,7 @@
         self.assertTrue("group2" in results)
         self.assertTrue("group3" in results)
 
+
     @inlineCallbacks
     def test_addRemove(self):
         results = yield self.runCommand(

Modified: CalendarServer/trunk/contrib/od/setup_directory.py
===================================================================
--- CalendarServer/trunk/contrib/od/setup_directory.py	2015-03-10 14:45:32 UTC (rev 14549)
+++ CalendarServer/trunk/contrib/od/setup_directory.py	2015-03-10 15:21:54 UTC (rev 14550)
@@ -283,6 +283,8 @@
 
     return records[0]
 
+
+
 def createRecord(node, recordType, recordName, attrs):
     record, error = node.createRecordWithRecordType_name_attributes_error_(
         recordType,
@@ -294,6 +296,8 @@
         raise ODError(error)
     return record
 
+
+
 def main():
 
     try:
@@ -301,7 +305,7 @@
     except GetoptError, e:
         usage(e)
 
-    for opt, arg in optargs:
+    for opt, _ignore_arg in optargs:
         if opt in ("-h", "--help"):
             usage()
 
@@ -416,6 +420,8 @@
 
             print("")
 
+
+
 class ODError(Exception):
     def __init__(self, error):
         self.message = (str(error), error.code())

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2015-03-10 14:45:32 UTC (rev 14549)
+++ CalendarServer/trunk/twistedcaldav/config.py	2015-03-10 15:21:54 UTC (rev 14550)
@@ -303,7 +303,6 @@
         self._cachedSyncToken = None
 
 
-
     def getKeyPath(self, keyPath):
         """
         Allows the getting of arbitrary nested dictionary keys via a single
@@ -382,6 +381,7 @@
             return dataToken
 
 
+
 def mergeData(oldData, newData):
     """
     Merge two ConfigDict objects; oldData will be updated with all the keys

Modified: CalendarServer/trunk/twistedcaldav/test/test_resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_resource.py	2015-03-10 14:45:32 UTC (rev 14549)
+++ CalendarServer/trunk/twistedcaldav/test/test_resource.py	2015-03-10 15:21:54 UTC (rev 14550)
@@ -118,6 +118,7 @@
         self.assertEquals(resource._mergeSyncTokens("1_4", "1_3"), "1_4")
 
 
+
 class OwnershipTests(TestCase):
     """
     L{CalDAVResource.isOwner} determines if the authenticated principal of the
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150310/b7ca37e5/attachment.html>


More information about the calendarserver-changes mailing list