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

[Jim Fulton]

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

Modified Files:
	testZopePublication.py 
Log Message:
implemented:

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/MergeSecurityIntoZopeNamespace

While I was at it, I couldn't resist implementing a variation of:

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/SecurityPackageReorg

which was a lot more work. 



=== Zope3/lib/python/Zope/App/ZopePublication/tests/testZopePublication.py 1.5 => 1.6 ===
 from Zope.Publisher.Browser.IBrowserPresentation import IBrowserPresentation
 
-from Zope.App.Security.PrincipalRegistry import principalRegistry
-from Zope.App.Security.PrincipalRoleManager import principalRoleManager
+from Zope.App.Security.Registries.PrincipalRegistry import principalRegistry
+from Zope.App.Security.Grants.Global.PrincipalRoleManager \
+     import principalRoleManager
 
 from Zope.App.ZopePublication.ZopePublication import ZopePublication
 from Zope.App.ZopePublication.Browser.Publication import BrowserPublication