[Checkins] SVN: zope.app.apidoc/trunk/s avoid deprecation warnings

[Fred L. Drake, Jr.]

Log message for revision 80935:
  avoid deprecation warnings

Changed:
  U   zope.app.apidoc/trunk/setup.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py

-=-
Modified: zope.app.apidoc/trunk/setup.py
===================================================================
--- zope.app.apidoc/trunk/setup.py	2007-10-19 13:38:29 UTC (rev 80934)
+++ zope.app.apidoc/trunk/setup.py	2007-10-19 14:50:00 UTC (rev 80935)
@@ -23,7 +23,7 @@
 
 setup(
     name = 'zope.app.apidoc',
-    version = '3.4.0',
+    version = '3.4.1',
     author = 'Zope Corporation and Contributors',
     author_email = 'zope3-dev at zope.org',
     description = 'API Documentation and Component Inspection for Zope 3',
@@ -97,7 +97,8 @@
       extras_require = dict(
           test=['zope.app.testing',
                 'zope.app.securitypolicy',
-                'zope.app.zcmlfiles'],
+                'zope.app.zcmlfiles',
+                'zope.securitypolicy'],
           static=['mechanize'],
           ),
       entry_points = """

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml	2007-10-19 13:38:29 UTC (rev 80934)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml	2007-10-19 14:50:00 UTC (rev 80935)
@@ -21,7 +21,7 @@
   <include package="zope.app.securitypolicy" />
 
   <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
   <role id="zope.Anonymous" title="Everybody"
                  description="All users have this role implicitly" />

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py	2007-10-19 13:38:29 UTC (rev 80934)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilities.py	2007-10-19 14:50:00 UTC (rev 80935)
@@ -31,11 +31,13 @@
 from zope.security.proxy import isinstance, removeSecurityProxy
 
 import zope.app
-from zope.app.i18n import ZopeMessageFactory as _
+import zope.i18nmessageid
 from zope.app.container.interfaces import IReadContainer
 
 from zope.app.apidoc.classregistry import safe_import, IGNORE_MODULES
 
+_ = zope.i18nmessageid.MessageFactory("zope")
+
 _remove_html_overhead = re.compile(
     r'(?sm)^<html.*<body.*?>\n(.*)</body>\n</html>\n')