[Checkins] SVN: zope.app.apidoc/trunk/ use zope.container instead of zope.app.container
Wolfgang Schnerring
wosc at wosc.de
Thu Jan 29 11:40:38 EST 2009
Log message for revision 95450:
use zope.container instead of zope.app.container
Changed:
U zope.app.apidoc/trunk/CHANGES.txt
U zope.app.apidoc/trunk/setup.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/apidoc.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/configure.zcml
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/codemodule.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/interfaces.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/module.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/enabled.zcml
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/configure.zcml
U zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/configure.zcml
U zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/configure.zcml
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/configure.zcml
-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/CHANGES.txt 2009-01-29 16:40:38 UTC (rev 95450)
@@ -5,7 +5,7 @@
3.5.1 (unreleased)
------------------
-- ...
+- Use zope.container instead of zope.app.container.
3.5.0 (2009-01-17)
------------------
Modified: zope.app.apidoc/trunk/setup.py
===================================================================
--- zope.app.apidoc/trunk/setup.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/setup.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -80,6 +80,7 @@
'zope.app.tree',
'zope.cachedescriptors',
'zope.component',
+ 'zope.container',
'zope.configuration',
'zope.deprecation',
'zope.i18n',
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/apidoc.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/apidoc.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/apidoc.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -40,14 +40,14 @@
self.__name__ = name
def get(self, key, default=None):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
utility = zope.component.queryUtility(IDocumentationModule, key, default)
if utility != default:
locate(utility, self, key)
return utility
def items(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
items = list(zope.component.getUtilitiesFor(IDocumentationModule))
items.sort()
utils = []
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/configure.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/configure.zcml 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/configure.zcml 2009-01-29 16:40:38 UTC (rev 95450)
@@ -5,7 +5,7 @@
<class class=".book.BookModule">
<allow interface=".book.IBookModule" />
- <allow interface="zope.app.container.interfaces.IReadContainer" />
+ <allow interface="zope.container.interfaces.IReadContainer" />
</class>
<!-- Register the module with the API Documentation System -->
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -13,7 +13,7 @@
##############################################################################
"""Class Views
-$Id: browser.py 29143 2005-02-14 22:43:16Z srichter $
+$Id$
"""
__docformat__ = 'restructuredtext'
@@ -66,7 +66,7 @@
codeModule = getUtility(IDocumentationModule, "Code")
for cls in classes:
# We need to removeAllProxies because the security checkers for
- # zope.app.container.contained.ContainedProxy and
+ # zope.container.contained.ContainedProxy and
# zope.app.i18n.messagecatalog.MessageCatalog prevent us from
# accessing __name__ and __module__.
unwrapped_cls = removeAllProxies(cls)
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/codemodule.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/codemodule.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/codemodule.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -91,11 +91,11 @@
return True
def get(self, key, default=None):
- """See zope.app.container.interfaces.IReadContainer."""
+ """See zope.container.interfaces.IReadContainer."""
self.setup()
return super(CodeModule, self).get(key, default)
def items(self):
- """See zope.app.container.interfaces.IReadContainer."""
+ """See zope.container.interfaces.IReadContainer."""
self.setup()
return super(CodeModule, self).items()
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/interfaces.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/interfaces.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/interfaces.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -20,7 +20,7 @@
import zope.schema
from zope.i18nmessageid import ZopeMessageFactory as _
-from zope.app.container.interfaces import IReadContainer
+from zope.container.interfaces import IReadContainer
class IAPIDocRootModule(zope.interface.Interface):
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/module.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/module.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/module.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -135,7 +135,7 @@
return self._package
def get(self, key, default=None):
- """See zope.app.container.interfaces.IReadContainer."""
+ """See zope.container.interfaces.IReadContainer."""
obj = self._children.get(key, default)
if obj is not default:
return obj
@@ -159,7 +159,7 @@
return obj
def items(self):
- """See zope.app.container.interfaces.IReadContainer."""
+ """See zope.container.interfaces.IReadContainer."""
# Only publicize public objects, even though we do keep track of
# private ones
return [(name, value)
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/enabled.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/enabled.zcml 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/enabled.zcml 2009-01-29 16:40:38 UTC (rev 95450)
@@ -24,7 +24,7 @@
<class class=".apidoc.APIDocumentation">
<require
- interface="zope.app.container.interfaces.IReadContainer"
+ interface="zope.container.interfaces.IReadContainer"
permission="zope.ManageApplication"
/>
</class>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/configure.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/configure.zcml 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/configure.zcml 2009-01-29 16:40:38 UTC (rev 95450)
@@ -4,7 +4,7 @@
<class class=".ifacemodule.InterfaceModule">
<allow interface=".ifacemodule.IInterfaceModule" />
- <allow interface="zope.app.container.interfaces.IReadContainer" />
+ <allow interface="zope.container.interfaces.IReadContainer" />
</class>
<!-- Register the module with the API Documentation System -->
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/configure.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/configure.zcml 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/configure.zcml 2009-01-29 16:40:38 UTC (rev 95450)
@@ -4,11 +4,11 @@
<class class=".type.TypeModule">
<allow interface="zope.app.apidoc.interfaces.IDocumentationModule" />
- <allow interface="zope.app.container.interfaces.IReadContainer" />
+ <allow interface="zope.container.interfaces.IReadContainer" />
</class>
<class class=".type.TypeInterface">
- <allow interface="zope.app.container.interfaces.IReadContainer"
+ <allow interface="zope.container.interfaces.IReadContainer"
attributes="interface" />
</class>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -60,13 +60,13 @@
self.interface = interface
def get(self, key, default=None):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
return LocationProxy(
queryUtility(self.interface, key, default=default),
self, key)
def items(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
results = [(name, LocationProxy(iface, self, name))
for name, iface in getUtilitiesFor(self.interface)]
results.sort(lambda x, y: cmp(x[1].getName(), y[1].getName()))
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -32,7 +32,7 @@
import zope.app
import zope.i18nmessageid
-from zope.app.container.interfaces import IReadContainer
+from zope.container.interfaces import IReadContainer
from zope.app.apidoc.classregistry import safe_import, IGNORE_MODULES
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/configure.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/configure.zcml 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/configure.zcml 2009-01-29 16:40:38 UTC (rev 95450)
@@ -4,7 +4,7 @@
<class class=".utilitymodule.UtilityModule">
<allow interface="zope.app.apidoc.interfaces.IDocumentationModule" />
- <allow interface="zope.app.container.interfaces.IReadContainer" />
+ <allow interface="zope.container.interfaces.IReadContainer" />
</class>
<class class=".utilitymodule.Utility">
@@ -12,7 +12,7 @@
</class>
<class class=".utilitymodule.UtilityInterface">
- <allow interface="zope.app.container.interfaces.IReadContainer" />
+ <allow interface="zope.container.interfaces.IReadContainer" />
<allow attributes="interface" />
</class>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -67,7 +67,7 @@
self.interface = interface
def get(self, key, default=None):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
sm = zope.component.getGlobalSiteManager()
key = decodeName(key)
if key == NONAME:
@@ -78,7 +78,7 @@
return utils and utils[0] or default
def items(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
sm = zope.component.getGlobalSiteManager()
items = [(encodeName(reg.name or NONAME), Utility(self, reg))
for reg in sm.registeredUtilities()
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2009-01-29 16:40:38 UTC (rev 95450)
@@ -76,7 +76,7 @@
return name
def get(self, key, default=None):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
ns = self.getFullName()
if not namespaces[ns].has_key(key):
return default
@@ -86,7 +86,7 @@
return directive
def items(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
list = []
for key in namespaces[self.getFullName()].keys():
list.append((key, self.get(key)))
@@ -147,7 +147,7 @@
def get(self, key, default=None):
- """See zope.app.container.interfaces.IReadContainer
+ """See zope.container.interfaces.IReadContainer
Get the namespace by name; long and abbreviated names work.
"""
@@ -166,7 +166,7 @@
def items(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
if namespaces is None or subdirs is None:
self._makeDocStructure()
list = []
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/configure.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/configure.zcml 2009-01-29 16:34:56 UTC (rev 95449)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/configure.zcml 2009-01-29 16:40:38 UTC (rev 95450)
@@ -4,7 +4,7 @@
<class class=".ZCMLModule">
<allow interface="zope.app.apidoc.interfaces.IDocumentationModule" />
- <allow interface="zope.app.container.interfaces.IReadContainer" />
+ <allow interface="zope.container.interfaces.IReadContainer" />
</class>
<class class=".Namespace">
More information about the Checkins
mailing list