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

[Andrew Sawyers]

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

Modified Files:
	test_TypesTool.py 
Log Message:

*Merging bugfixes from 1_2-branch into head.


=== CMF/CMFCore/tests/test_TypesTool.py 1.8 => 1.9 ===
 
         self.failIf( ti.isConstructionAllowed( folder ) )
-        self.assertRaises( 'Unauthorized', ti.isConstructionAllowed
+        self.assertRaises( Unauthorized, ti.isConstructionAllowed
                          , folder, raise_exc=1 )
 
 class FTIConstructionTests_w_Roles( unittest.TestCase ):
@@ -514,7 +514,7 @@
 
         newSecurityManager( None
                           , UserWithRoles( 'FooViewer' ).__of__( folder ) )
-        self.assertRaises( 'Unauthorized', ti.isConstructionAllowed
+        self.assertRaises( Unauthorized, ti.isConstructionAllowed
                          , folder, raise_exc=1 )
 
     def test_constructInstance_wo_Roles( self ):
@@ -524,7 +524,7 @@
         newSecurityManager( None
                           , UserWithRoles( 'FooViewer' ).__of__( folder ) )
 
-        self.assertRaises( 'Unauthorized'
+        self.assertRaises( Unauthorized
                          , ti.constructInstance, folder, 'foo' )
 
     def test_constructInstance( self ):