[CalendarServer-changes] [10072] CalendarServer/branches/users/glyph/one-home-list-api

source_changes at macosforge.org source_changes at macosforge.org
Fri Nov 16 14:49:19 PST 2012


Revision: 10072
          http://trac.calendarserver.org//changeset/10072
Author:   glyph at apple.com
Date:     2012-11-16 14:49:18 -0800 (Fri, 16 Nov 2012)
Log Message:
-----------
Remove remaining references to addressbookHomes / calendarHomes APIs.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/common.py
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/test_file.py
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/icalendarstore.py
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/common.py
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/test_file.py
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/iaddressbookstore.py
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/one-home-list-api/

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/common.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/common.py	2012-11-16 22:49:15 UTC (rev 10071)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/common.py	2012-11-16 22:49:18 UTC (rev 10072)
@@ -593,23 +593,6 @@
 
 
     @inlineCallbacks
-    def test_calendarHomes(self):
-        """
-        Finding all existing calendar homes.
-        """
-        calendarHomes = (yield self.transactionUnderTest().calendarHomes())
-        self.assertEquals(
-            [home.name() for home in calendarHomes],
-            [
-                "home1",
-                "home_no_splits",
-                "home_splits",
-                "home_splits_shared",
-            ]
-        )
-
-
-    @inlineCallbacks
     def test_displayNameNone(self):
         """
         L{ICalendarHome.calendarWithName} returns C{None} for calendars which

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/test_file.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/test_file.py	2012-11-16 22:49:15 UTC (rev 10071)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/datastore/test/test_file.py	2012-11-16 22:49:18 UTC (rev 10072)
@@ -502,25 +502,6 @@
 
 
     @inlineCallbacks
-    def test_calendarHomes(self):
-        """
-        Finding all existing calendar homes.
-        """
-        calendarHomes = (yield self.transactionUnderTest().calendarHomes())
-        self.assertEquals(
-            [home.name() for home in calendarHomes],
-            [
-                "home1",
-                "home_attachments",
-                "home_bad",
-                "home_no_splits",
-                "home_splits",
-                "home_splits_shared",
-            ]
-        )
-
-
-    @inlineCallbacks
     def test_calendarObjectsWithDotFile(self):
         """
         Adding a dotfile to the calendar home should not increase the number of

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/icalendarstore.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/icalendarstore.py	2012-11-16 22:49:15 UTC (rev 10071)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/caldav/icalendarstore.py	2012-11-16 22:49:18 UTC (rev 10072)
@@ -88,14 +88,6 @@
     Transaction functionality required to be implemented by calendar stores.
     """
 
-    def calendarHomes():
-        """
-        Retrieve each calendar home in the store.
-
-        @return: a L{Deferred} which fires with a list of L{ICalendarHome}.
-        """
-
-
     def calendarHomeWithUID(uid, create=False):
         """
         Retrieve the calendar home for the principal with the given C{uid}.

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/common.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/common.py	2012-11-16 22:49:15 UTC (rev 10071)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/common.py	2012-11-16 22:49:18 UTC (rev 10072)
@@ -234,20 +234,6 @@
 
 
     @inlineCallbacks
-    def test_addressbookHomes(self):
-        """
-        Finding all existing addressbook homes.
-        """
-        addressbookHomes = (yield self.transactionUnderTest().addressbookHomes())
-        self.assertEquals(
-            [home.name() for home in addressbookHomes],
-            [
-                "home1",
-            ]
-        )
-
-
-    @inlineCallbacks
     def test_addressbookHomeWithUID_exists(self):
         """
         Finding an existing addressbook home by UID results in an object that

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/test_file.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/test_file.py	2012-11-16 22:49:15 UTC (rev 10071)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/datastore/test/test_file.py	2012-11-16 22:49:18 UTC (rev 10072)
@@ -472,21 +472,6 @@
 
 
     @inlineCallbacks
-    def test_addressbookHomes(self):
-        """
-        Finding all existing addressbook homes.
-        """
-        addressbookHomes = (yield self.transactionUnderTest().addressbookHomes())
-        self.assertEquals(
-            [home.name() for home in addressbookHomes],
-            [
-                "home1",
-                "home_bad",
-            ]
-        )
-
-
-    @inlineCallbacks
     def test_addressbookObjectsWithDotFile(self):
         """
         Adding a dotfile to the addressbook home should not create a new

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/iaddressbookstore.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/iaddressbookstore.py	2012-11-16 22:49:15 UTC (rev 10071)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/carddav/iaddressbookstore.py	2012-11-16 22:49:18 UTC (rev 10072)
@@ -37,14 +37,6 @@
     Transaction interface that addressbook stores must provide.
     """
 
-    def addressbookHomes():
-        """
-        Retrieve each addressbook home in the store.
-
-        @return: a L{Deferred} which fires with a list of L{ICalendarHome}.
-        """
-
-
     def addressbookHomeWithUID(uid, create=False):
         """
         Retrieve the addressbook home for the principal with the given C{uid}.

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py	2012-11-16 22:49:15 UTC (rev 10071)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py	2012-11-16 22:49:18 UTC (rev 10072)
@@ -260,18 +260,10 @@
         CommonStoreTransaction._homeClass[EADDRESSBOOKTYPE] = AddressBookHome
 
 
-    def calendarHomes(self):
-        return self.homes(ECALENDARTYPE)
-
-
     def calendarHomeWithUID(self, uid, create=False):
         return self.homeWithUID(ECALENDARTYPE, uid, create=create)
 
 
-    def addressbookHomes(self):
-        return self.homes(EADDRESSBOOKTYPE)
-
-
     def addressbookHomeWithUID(self, uid, create=False):
         return self.homeWithUID(EADDRESSBOOKTYPE, uid, create=create)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121116/8d1fe002/attachment-0001.html>


More information about the calendarserver-changes mailing list