Revert "Add support for per calendar colors."

This reverts commit 00acbb286c4594feeb2c09e6e4267bcb4934b7b4.

This commit depends on metadata support in
69726bcb92a7aad177eb3af3cae1aa3302347a63, which hasn't been merged yet.

diff --git a/calypso/webdav.py b/calypso/webdav.py
index 12a9817b6ed1e57f4dee680589fd2fb7d427936e..133d684cab4bc62b4652fa24b79bef288e9734b2 100644 (file)
--- a/calypso/webdav.py
+++ b/calypso/webdav.py
@@ -565,13 +565,6 @@ class Collection(object):
         self.scan_dir(False)
         return self.my_items
 
-    def get_color(self):
-        """Color."""
-        try:
-            return "#%s" % self.metadata.get('collection', 'color')
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError, ValueError):
-            return None
-
     @property
     def last_modified(self):
         """Get the last time the collection has been modified.

diff --git a/calypso/xmlutils.py b/calypso/xmlutils.py
index 7de888da11a755f0f584ce92650a2b47ee48648a..202e263aef844b65c27ef792df80becc260b50cc 100644 (file)
--- a/calypso/xmlutils.py
+++ b/calypso/xmlutils.py
@@ -48,7 +48,6 @@ NAMESPACES = {
     "C": "urn:ietf:params:xml:ns:caldav",
     "A": "urn:ietf:params:xml:ns:carddav",
     "D": "DAV:",
-    "E": "http://apple.com/ns/ical/",
     "CS": "http://calendarserver.org/ns/"}
 
 log = logging.getLogger(__name__)
@@ -180,8 +179,6 @@ def propfind(path, xml_request, collection, depth, context):
                 element.text = item.etag
             elif tag == _tag("D", "displayname") and is_collection:
                 element.text = collection.name
-            elif tag == _tag("E", "calendar-color") and is_collection:
-                element.text = item.get_color()
             elif tag == _tag("D", "principal-URL"):
                 # TODO: use a real principal URL, read rfc3744-4.2 for info
                 tag = ET.Element(_tag("D", "href"))