diff --git a/doc/CHANGES.rst b/doc/CHANGES.rst index 116451252e..8c73e93296 100644 --- a/doc/CHANGES.rst +++ b/doc/CHANGES.rst @@ -8,6 +8,9 @@ http://docs.zope.org/zope2/releases/. 2.12.25 (unreleased) -------------------- +- Explicitly declared ZTUtils APIs as public (repairs breakages in apps + followin fix for LP #1047318). + 2.12.24 (2012-09-09) -------------------- diff --git a/src/ZTUtils/__init__.py b/src/ZTUtils/__init__.py index 4a259b5123..56514a8875 100644 --- a/src/ZTUtils/__init__.py +++ b/src/ZTUtils/__init__.py @@ -11,8 +11,6 @@ # ############################################################################## """Package of template utility classes and functions. - -$Id$ """ # BBB 2005/05/01 -- to be removed after 12 months import zope.deferredimport @@ -20,11 +18,17 @@ Iterator = 'ZTUtils.Iterator:Iterator' ) +from AccessControl.SecurityInfo import ModuleSecurityInfo +security = ModuleSecurityInfo('ZTUtils') + +security.declarePublic('encodeExpansion', 'decodeExpansion', 'a2b', 'b2a') from Tree import encodeExpansion, decodeExpansion, a2b, b2a -from SimpleTree import SimpleTreeMaker -__allow_access_to_unprotected_subobjects__ = 1 -__roles__ = None +security.declarePublic('SimpleTreeMaker') +from SimpleTree import SimpleTreeMaker +security.declarePublic('Batch', 'TreeMaker', 'SimpleTreeMaker', 'LazyFilter') from ZTUtils.Zope import Batch, TreeMaker, SimpleTreeMaker, LazyFilter + +security.declarePublic('url_query', 'make_query', 'make_hidden_input') from ZTUtils.Zope import url_query, make_query, make_hidden_input