[Zope-Checkins] CVS: Zope3/lib/python/Zope/I18n - MessageCatalog.py:1.7 configure.zcml:1.4

[Jim Fulton]

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

Modified Files:
	MessageCatalog.py configure.zcml 
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/I18n/MessageCatalog.py 1.6 => 1.7 ===
 from Zope.Proxy.ProxyIntrospection import removeAllProxies
 from Zope.ComponentArchitecture.IFactory import IFactory
-from Zope.App.Security.RegisteredObject import RegisteredObject
+from Zope.App.Security.Registries.RegisteredObject import RegisteredObject
 from Zope.I18n.IMessageCatalog import IMessageCatalog
 
 


=== Zope3/lib/python/Zope/I18n/configure.zcml 1.3 => 1.4 ===
    xmlns='http://namespaces.zope.org/zope'
-   xmlns:security='http://namespaces.zope.org/security'
    xmlns:zmi='http://namespaces.zope.org/zmi'
    xmlns:browser='http://namespaces.zope.org/browser'
    xmlns:service='http://namespaces.zope.org/service'
@@ -30,11 +29,11 @@
 
 <!-- Register the Translation Service as a content object -->
 <content class=".TranslationService.">
-   <security:require permission="Zope.Public"
+   <require permission="Zope.Public"
                      interface="Zope.I18n.ITranslationService." 
                      />
 
-   <security:require permission="Zope.ManageServices"
+   <require permission="Zope.ManageServices"
                      interface="Zope.App.OFS.Container.IContainer." 
                      />
 </content>
@@ -59,10 +58,10 @@
 
 <!-- Setup Message Catalogs -->
 <content class=".MessageCatalog.">
-   <security:require permission="Zope.Security"
+   <require permission="Zope.Security"
                      interface=".IMessageCatalog." 
                      />
-   <security:require permission="Zope.ManageServices"
+   <require permission="Zope.ManageServices"
                      attributes="setMessage getMessageIds"
                      />
 </content>