[CMF-checkins] CVS: Products/CMFCore/tests/base - dummy.py:1.18

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFCore/tests/base
In directory cvs.zope.org:/tmp/cvs-serv16803/CMFCore/tests/base

Modified Files:
	dummy.py 
Log Message:
Merged yuppie-collector119and201-branch:
- Fixed acquisition bug in getDiscussionFor. (Collector #119)
- Fixed acquisition bug in overrideDiscussionFor. (Collector #201)
- Some related cleanup.


=== Products/CMFCore/tests/base/dummy.py 1.17 => 1.18 ===
--- Products/CMFCore/tests/base/dummy.py:1.17	Tue Apr 13 13:38:59 2004
+++ Products/CMFCore/tests/base/dummy.py	Tue Jul 13 14:21:24 2004
@@ -1,7 +1,6 @@
 from Acquisition import Implicit, aq_base, aq_inner, aq_parent
 from OFS.SimpleItem import Item
 from Products.CMFCore.PortalContent import PortalContent
-from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from security import OmnipotentUser
 
@@ -253,12 +252,6 @@
     def __init__(self, anon=1):
         self.anon = anon
 
-    def isAnonymousUser(self):
-        return self.anon
-
-    def getAuthenticatedMember(self):
-        return DummyUser()
-
     def __call__( self ):
         return self.root
 
@@ -269,6 +262,16 @@
 
     def getIcon( self, relative=0 ):
         return 'Tool: %s' % relative
+
+    # MembershipTool
+    def getAuthenticatedMember(self):
+        return DummyUser()
+
+    def isAnonymousUser(self):
+        return self.anon
+
+    def checkPermission(self, permissionName, object, subobjectName=None):
+        return True
 
     # TypesTool
     def listTypeInfo(self, container=None):