[CMF-checkins] CVS: Products/CMFCore/tests - test_TypesTool.py:1.31

[Yvo Schubbe]

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

Modified Files:
	test_TypesTool.py 
Log Message:
- improved some warnings
- ignore warnings in unittests


=== Products/CMFCore/tests/test_TypesTool.py 1.30 => 1.31 ===
--- Products/CMFCore/tests/test_TypesTool.py:1.30	Wed Jul  7 11:53:14 2004
+++ Products/CMFCore/tests/test_TypesTool.py	Sat Aug  7 07:29:56 2004
@@ -4,7 +4,7 @@
 Zope.startup()
 from Interface.Verify import verifyClass
 
-from types import DictType
+from warnings import filterwarnings
 
 from AccessControl import Unauthorized
 from AccessControl.SecurityManagement import newSecurityManager
@@ -55,6 +55,8 @@
         """
         Are the correct, permitted methods returned for actions?
         """
+        filterwarnings('ignore', category=DeprecationWarning)
+
         site = self.site
         portal = site._setObject( 'portal', PortalFolder(id='portal') )
         portal.manage_addProduct = { 'FooProduct' : DummyFactory(portal) }
@@ -230,6 +232,7 @@
         self.failIf( 'slot' in visible )
 
     def test_getActionById( self ):
+        filterwarnings('ignore', category=DeprecationWarning)
 
         ti = self._makeInstance( 'Foo' )
         marker = []
@@ -311,7 +314,7 @@
         del ti._aliases
         self.failIf( hasattr(ti, '_aliases') )
         ti._actions = FTIDATA_CMF13[0]['actions']
-        self.failUnless( isinstance( ti._actions[0], DictType ) )
+        self.failUnless( isinstance(ti._actions[0], dict) )
 
         # migrate FTI
         ti.getMethodPath('view')
@@ -327,7 +330,7 @@
         del ti._aliases
         self.failIf( hasattr(ti, '_aliases') )
         ti._actions = FTIDATA_CMF13_FOLDER[0]['actions']
-        self.failUnless( isinstance( ti._actions[0], DictType ) )
+        self.failUnless( isinstance(ti._actions[0], dict) )
 
         # migrate FTI
         ti.getMethodPath('view')