[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ CookieCrumbler is no longer folder.

[Charlie Clark]

Log message for revision 110911:
  CookieCrumbler is no longer folder.

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py	2010-04-14 18:00:35 UTC (rev 110910)
+++ Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py	2010-04-14 18:40:47 UTC (rev 110911)
@@ -25,7 +25,8 @@
 from App.class_init import InitializeClass
 from App.special_dtml import HTMLFile
 from DateTime.DateTime import DateTime
-from OFS.Folder import Folder
+from OFS.SimpleItem import SimpleItem
+from OFS.PropertyManager import PropertyManager
 from OFS.interfaces import IObjectWillBeMovedEvent
 from zExceptions import Redirect
 from zope.container.interfaces import IObjectMovedEvent
@@ -34,6 +35,7 @@
 from ZPublisher.HTTPRequest import HTTPRequest
 
 from Products.CMFCore.interfaces import ICookieCrumbler
+from Products.CMFCore.utils import UniqueObject
 
 
 # Constants.
@@ -51,12 +53,16 @@
     """
 
 
-class CookieCrumbler(Folder):
+class CookieCrumbler(UniqueObject, PropertyManager, SimpleItem):
 
     """Reads cookies during traversal and simulates the HTTP auth headers.
     """
 
     implements(ICookieCrumbler)
+    
+    manage_options=(PropertyManager.manage_options
+                   + SimpleItem.manage_options
+                   )
 
     meta_type = 'Cookie Crumbler'
 
@@ -101,6 +107,10 @@
     local_cookie_path = False
     cache_header_value = 'private'
     log_username = True
+    
+    def __init__(self, id=None):
+        if id is not None:
+            self.id = str(id)
 
     security.declarePrivate('delRequestVar')
     def delRequestVar(self, req, name):

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py	2010-04-14 18:00:35 UTC (rev 110910)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py	2010-04-14 18:40:47 UTC (rev 110911)
@@ -369,8 +369,7 @@
     def test_before_traverse_hooks(self):
         from OFS.Folder import Folder
         container = Folder()
-        cc = self._makeOne()
-        cc._setId(self._CC_ID)
+        cc = self._makeOne(self._CC_ID)
 
         marker = []
         bt_before = getattr(container, '__before_traverse__', marker)