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

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv32502/CMFCore/tests

Modified Files:
      Tag: yuppie-collector168-redo-branch
	test_TypesTool.py 
Log Message:
some cleanup:
- replaced apply() with direct call
- replaced 'dict' and 'file' variable names

=== CMF/CMFCore/tests/test_TypesTool.py 1.24 => 1.24.2.1 ===
--- CMF/CMFCore/tests/test_TypesTool.py:1.24	Fri Jul  4 03:58:51 2003
+++ CMF/CMFCore/tests/test_TypesTool.py	Tue Jul 15 07:31:10 2003
@@ -58,7 +58,7 @@
         self.ttool = self.site._setObject( 'portal_types', TypesTool() )
         fti = FTIDATA_DUMMY[0].copy()
         del fti['id']
-        self.ttool._setObject( 'Dummy Content', apply( FTI, ('Dummy Content',), fti) )
+        self.ttool._setObject( 'Dummy Content', FTI('Dummy Content', **fti) )
  
     def test_processActions( self ):
         """
@@ -161,9 +161,9 @@
                                )
         self.assertEqual( ti.immediate_view, 'foo_view' )
 
-    def _makeAndSetInstance( self,id,**kw ):
+    def _makeAndSetInstance(self, id, **kw):
         tool = self.tool
-        t = apply( self._makeInstance, (id,), kw )
+        t = self._makeInstance(id, **kw)
         tool._setObject(id,t)
         return tool[id]
               
@@ -323,7 +323,7 @@
         self.failIf( hasattr(ti, '_aliases') )
         ti._actions = FTIDATA_CMF13[0]['actions']
         self.failUnless( isinstance( ti._actions[0], DictType ) )
-
+
         # migrate FTI
         ti.getMethodPath('view')
         self._checkContentTI(ti)
@@ -339,7 +339,7 @@
         self.failIf( hasattr(ti, '_aliases') )
         ti._actions = FTIDATA_CMF13_FOLDER[0]['actions']
         self.failUnless( isinstance( ti._actions[0], DictType ) )
-
+
         # migrate FTI
         ti.getMethodPath('view')
         self._checkFolderTI(ti)
@@ -390,14 +390,14 @@
 
 class FTIDataTests( TypeInfoTests ):
 
-    def _makeInstance( self, id, **kw ):
-        return apply( FTI, ( id, ), kw )
+    def _makeInstance(self, id, **kw):
+        return FTI(id, **kw)
 
     def _makeInstanceByFTIData(self, ftidata):
         fti = ftidata[0].copy()
         id = fti['id']
         del fti['id']
-        return apply( FTI, ( id, ), fti )
+        return FTI(id, **fti)
 
     def test_properties( self ):
         ti = self._makeInstance( 'Foo' )
@@ -420,14 +420,14 @@
 
 class STIDataTests( TypeInfoTests ):
 
-    def _makeInstance( self, id, **kw ):
-        return apply( STI, ( id, ), kw )
+    def _makeInstance(self, id, **kw):
+        return STI(id, **kw)
 
     def _makeInstanceByFTIData(self, ftidata):
         fti = ftidata[0].copy()
         id = fti['id']
         del fti['id']
-        return apply( STI, ( id, ), fti )
+        return STI(id, **fti)
 
     def test_properties( self ):
         ti = self._makeInstance( 'Foo' )
@@ -453,8 +453,8 @@
     def setUp( self ):
         noSecurityManager()
 
-    def _makeInstance( self, id, **kw ):
-        return apply( FTI, ( id, ), kw )
+    def _makeInstance(self, id, **kw):
+        return FTI(id, **kw)
 
     def _makeFolder( self, fake_product=0 ):
         return DummyFolder( fake_product )