[Checkins] SVN: zope.app.apidoc/trunk/ Avoid deprecation warnings.
Stephan Richter
srichter at cosmos.phy.tufts.edu
Tue Oct 30 14:43:40 EDT 2007
Log message for revision 81215:
Avoid deprecation warnings.
Changed:
U zope.app.apidoc/trunk/CHANGES.txt
U zope.app.apidoc/trunk/buildout.cfg
U zope.app.apidoc/trunk/setup.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/utilities.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/component.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py
-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/CHANGES.txt 2007-10-30 18:43:39 UTC (rev 81215)
@@ -2,6 +2,12 @@
CHANGES
=======
+3.4.2 (2007-10-30)
+------------------
+
+- Avoid deprecation warnings for ``ZopeMessageFactory``.
+
+
3.4.1 (2007-10-23)
------------------
Modified: zope.app.apidoc/trunk/buildout.cfg
===================================================================
--- zope.app.apidoc/trunk/buildout.cfg 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/buildout.cfg 2007-10-30 18:43:39 UTC (rev 81215)
@@ -1,5 +1,5 @@
[buildout]
-develop = .
+develop = . ../zope.app.preference
parts = test static-apidoc
[test]
Modified: zope.app.apidoc/trunk/setup.py
===================================================================
--- zope.app.apidoc/trunk/setup.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/setup.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -23,7 +23,7 @@
setup(
name = 'zope.app.apidoc',
- version = '3.4.1',
+ version = '3.4.2',
author = 'Zope Corporation and Contributors',
author_email = 'zope3-dev at zope.org',
description = 'API Documentation and Component Inspection for Zope 3',
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -18,16 +18,16 @@
listed in the documentation. This might be good, since unregistered interfaces
are usually private and not of interest to a general developer.
-$Id: __init__.py 29143 2005-02-14 22:43:16Z srichter $
+$Id$
"""
__docformat__ = 'restructuredtext'
import os.path
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.interface import implements
import zope.app.apidoc.bookmodule
from zope.app.apidoc.interfaces import IDocumentationModule
-from zope.app.i18n import ZopeMessageFactory as _
from zope.app.onlinehelp.onlinehelp import OnlineHelp
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -17,6 +17,7 @@
"""
__docformat__ = 'restructuredtext'
from zope.component import getMultiAdapter
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.interface.interface import InterfaceClass
from zope.proxy import removeAllProxies
from zope.publisher.browser import BrowserView
@@ -24,8 +25,6 @@
from zope.traversing.api import getParent
from zope.traversing.browser import absoluteURL
-from zope.app.i18n import ZopeMessageFactory as _
-
from zope.app.apidoc.apidoc import APIDocumentation
from zope.app.apidoc.utilities import getPythonPath, renderText, columnize
from zope.app.apidoc.codemodule.module import Module
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/utilities.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/utilities.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/utilities.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -17,10 +17,10 @@
"""
__docformat__ = 'restructuredtext'
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.traversing.api import getName, getParent
from zope.traversing.browser import absoluteURL
from zope.app.apidoc.interfaces import IDocumentationModule
-from zope.app.i18n import ZopeMessageFactory as _
class CodeBreadCrumbs(object):
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/codemodule.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/codemodule.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/codemodule.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -21,9 +21,9 @@
__docformat__ = 'restructuredtext'
import zope.component
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.interface import implements
-from zope.app.i18n import ZopeMessageFactory as _
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.classregistry import safe_import
from zope.app.apidoc.codemodule.interfaces import IAPIDocRootModule
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/interfaces.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/interfaces.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/interfaces.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -18,9 +18,9 @@
__docformat__ = "reStructuredText"
import zope.interface
import zope.schema
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.app.container.interfaces import IReadContainer
-from zope.app.i18n import ZopeMessageFactory as _
class IAPIDocRootModule(zope.interface.Interface):
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/component.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/component.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/component.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -17,21 +17,21 @@
"""
__docformat__ = 'restructuredtext'
import types
+import zope.interface.declarations
from zope.component import getGlobalSiteManager
from zope.component.interfaces import IFactory
from zope.component.registry import (
AdapterRegistration,
+ HandlerRegistration,
SubscriptionRegistration,
- HandlerRegistration,
+ UtilityRegistration
)
-from zope.component.registry import UtilityRegistration
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.interface import Interface
from zope.interface.interface import InterfaceClass
-import zope.interface.declarations
from zope.publisher.interfaces import IRequest
-from zope.app.i18n import ZopeMessageFactory as _
from zope.app.apidoc.classregistry import classRegistry
from zope.app.apidoc.utilities import relativizePath, truncateSysPath
from zope.app.apidoc.utilities import getPythonPath, isReferencable, renderText
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -21,6 +21,7 @@
import inspect
from zope.component import getUtility
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
from zope.publisher.interfaces.http import IHTTPRequest
@@ -31,8 +32,6 @@
from zope.traversing.api import getName, getParent, traverse
from zope.traversing.browser import absoluteURL
-from zope.app.i18n import ZopeMessageFactory as _
-
from zope.app.apidoc.utilities import getPythonPath, renderText
from zope.app.apidoc.apidoc import APIDocumentation
from zope.app.apidoc import classregistry
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -18,18 +18,18 @@
listed in the documentation. This might be good, since unregistered interfaces
are usually private and not of interest to a general developer.
-$Id: __init__.py 29143 2005-02-14 22:43:16Z srichter $
+$Id$
"""
__docformat__ = 'restructuredtext'
+from zope.component.interface import queryInterface
+from zope.component.interface import searchInterfaceUtilities
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.interface import implements
from zope.location import LocationProxy
-from zope.component.interface import queryInterface
-from zope.component.interface import searchInterfaceUtilities
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
-from zope.app.i18n import ZopeMessageFactory as _
class IInterfaceModule(IDocumentationModule):
"""Interface API Documentation Module
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -21,7 +21,7 @@
import zope.interface
import zope.schema
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
class IInterfaceDetailsPreferences(zope.interface.Interface):
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -20,7 +20,7 @@
from zope.component.registry import AdapterRegistration
from zope.interface import Interface
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.app.apidoc.utilities import getPythonPath, relativizePath
from zope.app.apidoc.utilities import getPermissionIds
from zope.app.apidoc.component import getParserInfoInfoDictionary
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/type.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -13,17 +13,17 @@
##############################################################################
"""Interface Types Documentation Module
-$Id: __init__.py 29143 2005-02-14 22:43:16Z srichter $
+$Id$
"""
__docformat__ = 'restructuredtext'
from zope.interface import implements
from zope.component import queryUtility, getUtilitiesFor
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.interface.interfaces import IInterface
from zope.location import LocationProxy
from zope.location.interfaces import ILocation
-from zope.app.i18n import ZopeMessageFactory as _
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
@@ -43,13 +43,13 @@
>>> typeiface = TypeInterface(IFoo, None, None)
>>> typeiface.interface
<InterfaceClass zope.app.apidoc.typemodule.type.IFoo>
-
+
>>> typeiface.get('Foo').__class__ == Foo
True
>>> typeiface.items() #doctest:+ELLIPSIS
[(u'Foo', <zope.app.apidoc.typemodule.type.Foo instance at ...>)]
-
+
"""
implements(ILocation)
@@ -80,7 +80,7 @@
>>> class IFoo(IInterface):
... pass
-
+
>>> from zope.app.testing import ztapi
>>> ztapi.provideUtility(IInterface, IFoo, 'IFoo')
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -13,7 +13,7 @@
##############################################################################
"""Utility Documentation Module
-$Id: __init__.py 29199 2005-02-17 22:38:55Z srichter $
+$Id$
"""
__docformat__ = 'restructuredtext'
@@ -24,7 +24,7 @@
from zope.interface import implements
from zope.location.interfaces import ILocation
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.app.component import queryNextSiteManager
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase, getPythonPath
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2007-10-30 17:50:11 UTC (rev 81214)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2007-10-30 18:43:39 UTC (rev 81215)
@@ -23,11 +23,11 @@
__docformat__ = 'restructuredtext'
from zope.configuration import docutils, xmlconfig
+from zope.i18nmessageid import ZopeMessageFactory as _
from zope.interface import implements
from zope.location.interfaces import ILocation
import zope.app.appsetup.appsetup
-from zope.app.i18n import ZopeMessageFactory as _
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
More information about the Checkins
mailing list