[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication/tests - testZopePublication.py:1.1.2.20.2.1

[Casey Duncan]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZopePublication/tests
In directory cvs.zope.org:/tmp/cvs-serv11768/Zope/App/ZopePublication/tests

Modified Files:
      Tag: casey-security-reorg-branch
	testZopePublication.py 
Log Message:
Mass checkin for security reorganization branch. I will retest this and merge
upon BDFL approval...


=== Zope3/lib/python/Zope/App/ZopePublication/tests/testZopePublication.py 1.1.2.20 => 1.1.2.20.2.1 ===
 
 from Zope.App.Security.PrincipalRegistry import principalRegistry
-from Zope.App.Security.PrincipalRoleManager import principalRoleManager
+from Zope.App.Security.Management.GlobalPrincipalRoles \
+     import principalRolesManager
 from Zope.ComponentArchitecture import provideView
 
 
@@ -158,7 +159,7 @@
                                               'timbot',
                                               'ai at its best')
         
-        principalRoleManager.assignRoleToPrincipal('Manager', 'tim')
+        principalRolesManager.assignRoleToPrincipal('Manager', 'tim')
 
 
         # now place our object inside the application