[CalendarServer-changes] [6848] CalendarServer/trunk/txdav/base/propertystore

[source_changes at macosforge.org]

Revision: 6848
          http://trac.macosforge.org/projects/calendarserver/changeset/6848
Author:   cdaboo at apple.com
Date:     2011-02-02 10:56:36 -0800 (Wed, 02 Feb 2011)
Log Message:
-----------
For Wilfredo to test.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/base/propertystore/base.py
    CalendarServer/trunk/txdav/base/propertystore/none.py

Modified: CalendarServer/trunk/txdav/base/propertystore/base.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/base.py	2011-02-02 02:05:44 UTC (rev 6847)
+++ CalendarServer/trunk/txdav/base/propertystore/base.py	2011-02-02 18:56:36 UTC (rev 6848)
@@ -123,7 +123,7 @@
 
 
     def __str__(self):
-        return "<%s %s>" % (self.__class__.__name__)
+        return "<%s>" % (self.__class__.__name__)
 
     def _setPerUserUID(self, uid):
         self._peruser = uid

Modified: CalendarServer/trunk/txdav/base/propertystore/none.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/none.py	2011-02-02 02:05:44 UTC (rev 6847)
+++ CalendarServer/trunk/txdav/base/propertystore/none.py	2011-02-02 18:56:36 UTC (rev 6848)
@@ -19,8 +19,6 @@
 Always-empty property store.
 """
 
-from __future__ import absolute_import
-
 __all__ = [
     "PropertyStore",
 ]
@@ -33,28 +31,24 @@
     Always-empty property store.
     Writing properties is not allowed.
     """
-    def __init__(self, defaultuser, pathFactory):
-        super(PropertyStore, self).__init__(defaultuser)
-        del self.__setitem__
-        del self.__delitem__
 
     #
-    # Required implementations
+    # We override the UserDict items directly here rather than the _uid methods
     #
 
-    def _getitem_uid(self, key, uid):
+    def __getitem__(self, key):
         validKey(key)
         raise KeyError(key)
 
-    def _setitem_uid(self, key, value, uid):
+    def __setitem__(self, key, value):
         validKey(key)
         raise PropertyChangeNotAllowedError("Property store is read-only.", (key,))
 
-    def _delitem_uid(self, key, uid):
+    def __delitem__(self, key):
         validKey(key)
         raise KeyError(key)
 
-    def _keys_uid(self, uid):
+    def keys(self):
         return ()
 
     #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110202/3cc1ad47/attachment.html>