[CalendarServer-changes] [10840] CalendarServer/branches/users/gaya/sharedgroups/txdav

source_changes at macosforge.org source_changes at macosforge.org
Mon Mar 4 15:32:56 PST 2013


Revision: 10840
          http://trac.calendarserver.org//changeset/10840
Author:   gaya at apple.com
Date:     2013-03-04 15:32:56 -0800 (Mon, 04 Mar 2013)
Log Message:
-----------
remove unused _xxxTable attributes from CommonObjectResource, CalendarHome, Calendar, CalendarObject

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/sql.py
    CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/sql.py	2013-03-04 23:15:19 UTC (rev 10839)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/caldav/datastore/sql.py	2013-03-04 23:32:56 UTC (rev 10840)
@@ -313,15 +313,7 @@
     _revisionsSchema = schema.CALENDAR_OBJECT_REVISIONS
     _objectSchema = schema.CALENDAR_OBJECT
 
-    # string mappings (old, removing)
-    _homeTable = CALENDAR_HOME_TABLE
-    _homeMetaDataTable = CALENDAR_HOME_METADATA_TABLE
-    _childTable = CALENDAR_TABLE
-    _bindTable = CALENDAR_BIND_TABLE
-    _objectBindTable = CALENDAR_OBJECT_AND_BIND_TABLE
     _notifierPrefix = "CalDAV"
-    _revisionsTable = CALENDAR_OBJECT_REVISIONS_TABLE
-
     _dataVersionKey = "CALENDAR-DATAVERSION"
 
     _cacher = Memcacher("SQL.calhome", pickle=True, key_normalization=False)
@@ -587,14 +579,6 @@
     _objectSchema = schema.CALENDAR_OBJECT
     _timeRangeSchema = schema.TIME_RANGE
 
-    # string mappings (old, removing)
-    _bindTable = CALENDAR_BIND_TABLE
-    _homeChildTable = CALENDAR_TABLE
-    _homeChildBindTable = CALENDAR_AND_CALENDAR_BIND
-    _revisionsTable = CALENDAR_OBJECT_REVISIONS_TABLE
-    _revisionsBindTable = CALENDAR_OBJECT_REVISIONS_AND_BIND_TABLE
-    _objectTable = CALENDAR_OBJECT_TABLE
-
     _supportedComponents = None
 
     def __init__(self, *args, **kw):
@@ -953,7 +937,6 @@
 class CalendarObject(CommonObjectResource, CalendarObjectBase):
     implements(ICalendarObject)
 
-    _objectTable = CALENDAR_OBJECT_TABLE
     _objectSchema = schema.CALENDAR_OBJECT
 
     def __init__(self, calendar, name, uid, resourceID=None, metadata=None):

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-03-04 23:15:19 UTC (rev 10839)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-03-04 23:32:56 UTC (rev 10840)
@@ -3787,8 +3787,6 @@
         "_parentCollection",
     )
 
-    _objectTable = None
-
     _objectSchema = None
 
     BATCH_LOAD_SIZE = 50
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130304/eeed48fe/attachment.html>


More information about the calendarserver-changes mailing list