[CMF-checkins] CVS: Products/CMFCore/tests - test_PortalFolder.py:1.21.4.10

[Stefan H. Holek]

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

Modified Files:
      Tag: CMF-1_4-branch
	test_PortalFolder.py 
Log Message:
Attempt to make tests runnable with Python 2.1 again.


=== Products/CMFCore/tests/test_PortalFolder.py 1.21.4.9 => 1.21.4.10 ===
--- Products/CMFCore/tests/test_PortalFolder.py:1.21.4.9	Mon Aug  9 12:33:14 2004
+++ Products/CMFCore/tests/test_PortalFolder.py	Tue Aug 10 08:00:06 2004
@@ -1,5 +1,6 @@
 from unittest import TestCase, TestSuite, makeSuite, main
 
+import Testing
 import Zope
 try:
     Zope.startup()
@@ -325,6 +326,7 @@
                 self._context = context
 
             def __call__( self, id ):
+                from Products.CMFCore.PortalFolder import PortalFolder
                 self._grabbed_with = id
                 self._context._setOb( id, PortalFolder( id ) )
                 self._context._getOb( id )._setPortalTypeName( 'Grabbed' )
@@ -1046,6 +1048,7 @@
         self.app.portal_types = DummyTypesTool()
 
         def _no_delete_objects(permission, object, context):
+            from AccessControl.Permissions import delete_objects as DeleteObjects
             return permission != DeleteObjects
 
         self._initPolicyAndUser( c_lambda=_no_delete_objects )
@@ -1060,7 +1063,7 @@
 class DummyTypeInfo:
 
     def allowType( self, portal_type ):
-        return True
+        return 1
 
 class DummyTypesTool( Implicit ):