[Zope3-checkins] SVN: Zope3/trunk/src/zope/ The "X" is gone.

Philipp von Weitershausen philikon at philikon.de
Tue Oct 11 14:31:26 EDT 2005


Log message for revision 39058:
  
  The "X" is gone.
  

Changed:
  U   Zope3/trunk/src/zope/app/adapter/adapter.py
  U   Zope3/trunk/src/zope/app/appsetup/bootstrap.py
  U   Zope3/trunk/src/zope/app/component/bbb/localservice.py
  U   Zope3/trunk/src/zope/app/component/bbb/registration.py
  U   Zope3/trunk/src/zope/app/component/bbb/site.py
  U   Zope3/trunk/src/zope/app/component/metaconfigure.py
  U   Zope3/trunk/src/zope/app/pluggableauth/__init__.py
  U   Zope3/trunk/src/zope/app/registration/interfaces.py
  U   Zope3/trunk/src/zope/app/registration/registration.py
  U   Zope3/trunk/src/zope/app/site/folder.py
  U   Zope3/trunk/src/zope/app/site/interfaces.py
  U   Zope3/trunk/src/zope/app/site/metaconfigure.py
  U   Zope3/trunk/src/zope/app/site/service.py
  U   Zope3/trunk/src/zope/app/site/servicecontainer.py
  U   Zope3/trunk/src/zope/app/utility/interfaces.py
  U   Zope3/trunk/src/zope/app/utility/utility.py
  U   Zope3/trunk/src/zope/app/zapi/__init__.py
  U   Zope3/trunk/src/zope/server/http/publisherhttpserver.py

-=-
Modified: Zope3/trunk/src/zope/app/adapter/adapter.py
===================================================================
--- Zope3/trunk/src/zope/app/adapter/adapter.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/adapter/adapter.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -21,4 +21,4 @@
 
 deprecated('LocalAdapterService',
            'Services have been removed. Use site manager API. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/appsetup/bootstrap.py
===================================================================
--- Zope3/trunk/src/zope/app/appsetup/bootstrap.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/appsetup/bootstrap.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -157,8 +157,8 @@
 def checkSecurityPolicy(event):
     """Warn if the configured security policy is ParanoidSecurityPolicy
 
-    Between Zope X3 3.0 and Zope X3 3.1 the security policy got
-    refactored and now it needs to be included from site.zcml.
+    Between Zope X3 3.0 and Zope 3.1, the security policy configuration
+    was refactored and now it needs to be included from site.zcml.
     """
     if getSecurityPolicy() is ParanoidSecurityPolicy:
         logging.getLogger('zope.app.appsetup').warn(

Modified: Zope3/trunk/src/zope/app/component/bbb/localservice.py
===================================================================
--- Zope3/trunk/src/zope/app/component/bbb/localservice.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/component/bbb/localservice.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -18,7 +18,7 @@
 zope.deprecation.deprecated(
     ('queryNextService', 'getNextService'),
     'The concept of services has been removed. Use utilities instead. '
-    'The reference will be gone in X3.3.')
+    'The reference will be gone in Zope 3.3.')
 
 
 def setSite(site=None):
@@ -28,4 +28,4 @@
 zope.deprecation.deprecated(
     'setSite',
     "`setSite()`'s official location is in `zope.app.component.site`."
-    "The reference will be gone in X3.3.")
+    "The reference will be gone in Zope 3.3.")

Modified: Zope3/trunk/src/zope/app/component/bbb/registration.py
===================================================================
--- Zope3/trunk/src/zope/app/component/bbb/registration.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/component/bbb/registration.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -109,7 +109,7 @@
         return self.__BBB_getComponent()
     getComponent = zope.deprecation.deprecated(getComponent,
                               'Use component directly. '
-                              'The reference will be gone in X3.3.')
+                              'The reference will be gone in Zope 3.3.')
 
     def __BBB_getComponent(self):
         if self._component is NULL_COMPONENT:
@@ -170,7 +170,7 @@
     componentPath = zope.deprecation.deprecated(
         componentPath,
         'Use component directly. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def __setstate__(self, dict):
         super(BBBComponentRegistration, self).__setstate__(dict)
@@ -193,7 +193,7 @@
         'This method is not needed anymore, since registration stacks are '
         'gone. There is now always only one registration per configuration '
         'in the registry. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def createRegistrationsFor(self, cfg):
         # Ignore
@@ -203,7 +203,7 @@
         'This method used to create a registration stack. These stacks are '
         'gone, so that this method is not required anymore. You can now '
         'directly activate and deactivate registrations with a registry. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
     
 
 class BBBRegistrationManager(object):
@@ -230,7 +230,7 @@
         getRegistrationManager,
         'This method has been deprecated in favor of the '
         '`registrationManager` attribute. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def findModule(self, name):
         from zope.app.module import findModule
@@ -239,7 +239,7 @@
         findModule,
         'This method has been deprecated and its functionality is now '
         'available via the `zope.app.module.findModule` function. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def resolve(self, name):
         from zope.app.module import resolve
@@ -248,7 +248,7 @@
         findModule,
         'This method has been deprecated and its functionality is now '
         'available via the `zope.app.module.resolve` function. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
         
 
 class BBBRegistered(object):
@@ -260,7 +260,7 @@
         addUsage,
         'The concept of usages has been deprecated. `Registered` is now a '
         'read-only adapter. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def removeUsage(self, location):
         # Ignore in the hope that noone uses this
@@ -269,7 +269,7 @@
         removeUsage,
         'The concept of usages has been deprecated. `Registered` is now a '
         'read-only adapter. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def usages(self):
         return [zapi.getPath(reg.component)
@@ -278,4 +278,4 @@
         usages,
         'The concept of usages has been deprecated. You can get the '
         'registrations for a component now via the `registrations` attribute. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/component/bbb/site.py
===================================================================
--- Zope3/trunk/src/zope/app/component/bbb/site.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/component/bbb/site.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -57,7 +57,7 @@
         'The site manager does not handle registrations directly anymore. '
         'The utility and adapter registry are available via the `utilities` '
         'and `adapters` attributes, respectively. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
     def queryRegistrations(self, name, default=None):
         """See INameRegistry"""
@@ -67,14 +67,14 @@
         'The site manager does not handle registrations directly anymore. '
         'The utility and adapter registry are available via the `utilities` '
         'and `adapters` attributes, respectively. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
     def addSubsite(self, sub):
         return self.addSub(sub)
     addSubsite = zope.deprecation.deprecated(
         addSubsite,
         'Use `addSub()` instead. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def createRegistrationsFor(self, cfg):
         # Ignore
@@ -84,7 +84,7 @@
         'The site manager does not handle registrations directly anymore. '
         'The utility and adapter registry are available via the `utilities` '
         'and `adapters` attributes, respectively. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def createRegistrations(self, name):
         # Ignore
@@ -94,7 +94,7 @@
         'The site manager does not handle registrations directly anymore. '
         'The utility and adapter registry are available via the `utilities` '
         'and `adapters` attributes, respectively. '
-        'The reference will be gone in X3.3.')
+        'The reference will be gone in Zope 3.3.')
 
     def listRegistrationNames(self):
         # Only used for services
@@ -107,7 +107,7 @@
         'The site manager does not handle registrations directly anymore. '
         'The utility and adapter registry are available via the `utilities` '
         'and `adapters` attributes, respectively. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
         
     def queryActiveComponent(self, name, default=None):
         return self.queryLocalService(name, default)
@@ -116,7 +116,7 @@
         'The site manager does not handle registrations directly anymore. '
         'The utility and adapter registry are available via the `utilities` '
         'and `adapters` attributes, respectively. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
     def getServiceDefinitions(self):
         gsm = zapi.getGlobalSiteManager()
@@ -124,14 +124,14 @@
     getServiceDefinitions = zope.deprecation.deprecated(
         getServiceDefinitions,
         'The concept of services has been removed. Use utilities instead. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
     def getService(self, name):
         return zapi.getUtility(IService, name, self)
     getService = zope.deprecation.deprecated(
         getService,
         'The concept of services has been removed. Use utilities instead. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
     def queryLocalService(self, name, default=None):
         if name in _builtinServices:
@@ -145,7 +145,7 @@
     queryLocalService = zope.deprecation.deprecated(
         queryLocalService,
         'The concept of services has been removed. Use utilities instead. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
     def getInterfaceFor(self, service_type):
         iface = [iface
@@ -155,7 +155,7 @@
     getInterfaceFor = zope.deprecation.deprecated(
         getInterfaceFor,
         'The concept of services has been removed. Use utilities instead. '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
     def queryComponent(self, type=None, filter=None, all=0):
         # Ignore, hoping that noone uses this horrible method
@@ -163,7 +163,7 @@
     getInterfaceFor = zope.deprecation.deprecated(
         getInterfaceFor,
         'This method was pretty useless even before services were gone! '
-        'The method will be gone in X3.3.')
+        'The method will be gone in Zope 3.3.')
 
 _builtinServices = ('Utilities', 'Adapters')
 

Modified: Zope3/trunk/src/zope/app/component/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/component/metaconfigure.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/component/metaconfigure.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -87,7 +87,7 @@
             warnings.warn(
                 "\n  %s\n"
                 "Use of factory without provides to indicate a handler "
-                "is deprecated and will change it's meaning in Zope X3.3. "
+                "is deprecated and will change it's meaning in Zope 3.3. "
                 "Use the handler attribute instead."
                 % _context.info,
                 DeprecationWarning)
@@ -470,7 +470,7 @@
 deprecated('defaultView',
            'The zope:defaultView directive has been deprecated in favor of '
            'the browser:defaultView directive. '
-           'Will be gone in X3.3.')
+           'Will be gone in Zope 3.3.')
 ############################################################################
 
 def defaultLayer(_context, type, layer):

Modified: Zope3/trunk/src/zope/app/pluggableauth/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/pluggableauth/__init__.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/pluggableauth/__init__.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -196,7 +196,7 @@
 deprecated('PluggableAuthenticationService',
            'The pluggable authentication service has been deprecated in '
            'favor of authentication (aka PAS). This reference will be gone in '
-           'Zope X3.3.')
+           'Zope 3.3.')
 
 def PluggableAuthenticationAddSubscriber(self, event):
     r"""Generates an earmark if one is not provided.

Modified: Zope3/trunk/src/zope/app/registration/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/interfaces.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/registration/interfaces.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -28,11 +28,11 @@
 deprecated(('UnregisteredStatus', 'RegisteredStatus'),
            'Registered and unregistered status has have been collapsed into '
            'zope.app.component.interfaces.registration.InactiveStatus. '
-           'Will be gone in X3.3.')
+           'Will be gone in Zope 3.3.')
 deprecated('ActiveStatus',
            'ActiveStatus is now available in '
            'zope.app.component.interfaces.registration. '
-           'Will be gone in X3.3.')
+           'Will be gone in Zope 3.3.')
 
 IRegistrationEvent = registration.IRegistrationEvent
 IRegistrationActivatedEvent = registration.IRegistrationActivatedEvent
@@ -42,7 +42,7 @@
             'IRegistrationActivatedEvent', 'IRegistrationDeactivatedEvent'),
            'The registration events have moved to '
            'zope.app.component.interfaces.registration. '
-           'Will be gone in X3.3.')
+           'Will be gone in Zope 3.3.')
 
 
 class INoLocalServiceError(Interface):
@@ -58,7 +58,7 @@
 
 deprecated(('INoLocalServiceError', 'NoLocalServiceError'),
            'The concept of services has been removed. This event will '
-           'be gone in X3.3.')
+           'be gone in Zope 3.3.')
 
 IRegistration = registration.IRegistration
 
@@ -66,7 +66,7 @@
             'IRegistrationActivatedEvent', 'IRegistrationDeactivatedEvent'),
            'The registration events have moved to '
            'zope.app.component.interfaces.registration. '
-           'Will be gone in X3.3.')
+           'Will be gone in Zope 3.3.')
 
 class IComponentPath(ITextLine):
     """A component path
@@ -86,27 +86,27 @@
 deprecated(('IComponentPath', 'ComponentPath'),
            'Registrations now use component references instead of component '
            'paths. Use zope.app.component.interfaces.registration.Component '
-           'instead. This field will be gone in X3.3.')
+           'instead. This field will be gone in Zope 3.3.')
 
 IComponentRegistration = registration.IComponentRegistration
 
 deprecated('IComponentRegistration',
            'The IComponentRegistration interface has moved to '
            'zope.app.component.interfaces.registration. '
-           'This reference will be gone in X3.3.')
+           'This reference will be gone in Zope 3.3.')
 
 from zope.app.component.bbb.interfaces import IRegistrationStack
 
 deprecated('IRegistrationStack',
            'The registration stack concept has been removed. '
-           'This interface will be gone in X3.3.')
+           'This interface will be gone in Zope 3.3.')
 
 IRegistry = registration.IRegistry
 
 deprecated('IRegistry',
            'The IRegistry interface has moved to '
            'zope.app.component.interfaces.registration. '
-           'This reference will be gone in X3.3.')
+           'This reference will be gone in Zope 3.3.')
 
 class IOrderedContainer(Interface):
     """Containers whose items can be reorderd."""
@@ -131,7 +131,7 @@
            'The ordered container should have not been declared here. The '
            'registerable container does not support this interface anymore, '
            'since it was useless anyways. '
-           'This interface will be gone in X3.3.')
+           'This interface will be gone in Zope 3.3.')
 
 IRegistrationManager = registration.IRegistrationManager
 IRegisterableContainer = registration.IRegisterableContainer
@@ -142,14 +142,14 @@
             'IRegisterable', 'IRegistered'), 
            'This interface has moved to '
            'zope.app.component.interfaces.registration. '
-           'This reference will be gone in X3.3.')
+           'This reference will be gone in Zope 3.3.')
 
 IAttributeRegisterable = IRegisterable
 
 deprecated('IAttributeRegisterable', 
            'Registrations are not stored on the component anymore and thus '
            'the attribute registerable is now simply a registerable. '
-           'This reference will be gone in X3.3.')
+           'This reference will be gone in Zope 3.3.')
 
 class INoRegistrationManagerError(Interface):
     """No registration manager error
@@ -168,4 +168,4 @@
 deprecated(('INoRegistrationManagerError', 'NoRegistrationManagerError'),
            'It is now guaranteed that a registerable container has a '
            'registration manager; thus this error is never raised. '
-           'This event will be gone in X3.3.')
+           'This event will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/registration/registration.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/registration.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/registration/registration.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -30,20 +30,20 @@
             'RegistrationActivatedEvent', 'RegistrationDeactivatedEvent'),
            'The registration events have moved to '
            'zope.app.component.registration. '
-           'Will be gone in X3.3.')
+           'Will be gone in Zope 3.3.')
 
 RegistrationStatusPropery = registration.RegistrationStatusProperty
 
 deprecated('RegistrationStatusProperty',
            'The status property has moved to zope.app.component.registration. '
-           'Will be gone in X3.3.')
+           'Will be gone in Zope 3.3.')
 
 from zope.app.component.bbb.registration import RegistrationStack
 NotifyingRegistrationStack = RegistrationStack
 
 deprecated(('RegistrationStack', 'NotifyingRegistrationStack'),
            'The registration stack concept has been removed. '
-           'This class will be gone in X3.3.')
+           'This class will be gone in Zope 3.3.')
 
 SimpleRegistrationRemoveSubscriber = \
     registration.SimpleRegistrationRemoveSubscriber
@@ -67,4 +67,4 @@
             'RegisterableMoveSubscriber', 'Registered',
             'RegistrationManager', 'RegisterableContainer'),
            'This class has moved to zope.app.component.registration. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/site/folder.py
===================================================================
--- Zope3/trunk/src/zope/app/site/folder.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/site/folder.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -23,7 +23,7 @@
 
 deprecated(('SiteManagementFolder', 'SMFolderFactory'),
            'This class has moved to zope.app.component.site. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 # I really hope that noone is using this.
 class SiteManagementFolders(BTreeContainer):
@@ -31,4 +31,4 @@
 
 deprecated('SiteManagementFolders',
            'This class has been deprecated. It was not used anyways. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/site/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/site/interfaces.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/site/interfaces.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -27,14 +27,14 @@
 
 deprecated(('IPossibleSite', 'ISite'),
            'This interface has been moved to zope.app.component.interfaces. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 ISiteManager = ILocalSiteManager
 
 deprecated('ISiteManager',
            'This interface has been moved to zope.app.component.interfaces '
            'and been renamed ISiteManager. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 class ILocalService(registration.IRegisterable):
     """A local service isn't a local service if it doesn't implement this.
@@ -54,7 +54,7 @@
 
 deprecated(('ILocalService', 'ISimpleService'),
            'The concept of services has been removed. Use utilities instead. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 class IComponentManager(Interface):
 
@@ -74,7 +74,7 @@
 
 deprecated('IComponentManager',
            'This interface has been removed. It was horrible anyways. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 class IBindingAware(Interface):
 
@@ -94,7 +94,7 @@
 
 deprecated('IBindingAware',
            'Now that services are gone, we do not need the binding support. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 class IServiceRegistration(registration.IComponentRegistration):
     """Service Registration
@@ -117,7 +117,7 @@
 
 deprecated('IServiceRegistration',
            'The concept of services has been removed. Use utilities instead. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 class ISiteManagementFolders(IContainer, IComponentManager):
     """A collection of ISiteManagementFolder objects.
@@ -129,4 +129,4 @@
 
 deprecated('ISiteManagementFolders',
            'This interface has been removed. It was unused. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/site/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/site/metaconfigure.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/site/metaconfigure.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -34,4 +34,4 @@
 zope.deprecation.deprecated(
     'LocalServiceDirective',
     'The concept of services has been removed. Use utilities instead. '
-    'The reference will be gone in X3.3.')
+    'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/site/service.py
===================================================================
--- Zope3/trunk/src/zope/app/site/service.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/site/service.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -31,13 +31,13 @@
 zope.deprecation.deprecated(
     ('SiteManager', 'UtilityRegistration'),
     'This class has been moved to zope.app.component.site. '
-    'The reference will be gone in X3.3.')
+    'The reference will be gone in Zope 3.3.')
 
 zope.deprecation.deprecated(
     'IRegisterableContainerContainer',
     'This interface has been moved to zope.app.component.interfaces '
     'and been renamed to IRegisterableContainerContaining. '
-    'The reference will be gone in X3.3.')
+    'The reference will be gone in Zope 3.3.')
 
 ServiceManager = LocalSiteManager
 SiteManager = LocalSiteManager
@@ -51,4 +51,4 @@
 zope.deprecation.deprecated(
     ('ServiceManager', 'ServiceRegistration'),
     'The concept of services has been removed. Use utilities instead. '
-    'The reference will be gone in X3.3.')
+    'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/site/servicecontainer.py
===================================================================
--- Zope3/trunk/src/zope/app/site/servicecontainer.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/site/servicecontainer.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -25,4 +25,4 @@
 deprecated('ServiceManagerContainer',
            'This class has been moved to zope.app.component.site '
            'and been renamed to SiteManagerContainer. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/utility/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/utility/interfaces.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/utility/interfaces.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -23,7 +23,7 @@
 
 deprecated(('IUtilityRegistration', 'ILocalUtility'),
            'This interface has been moved to zope.app.component.interfaces. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 class ILocalUtilityService(
         zope.component.interfaces.IUtilityService,
@@ -33,4 +33,4 @@
 
 deprecated('ILocalUtilityService',
            'The concept of services has been removed. Use site manager API. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/utility/utility.py
===================================================================
--- Zope3/trunk/src/zope/app/utility/utility.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/utility/utility.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -26,15 +26,15 @@
 
 deprecated(('getNextUtility', 'queryNextUtility'),
            'This function has been moved to zope.app.component. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 deprecated('testingNextUtility',
            'This function has been moved to zope.app.component.testing. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 deprecated('UtilityRegistration',
            'This class has been moved to zope.app.component.site. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')
 
 
 class LocalUtilityService(Persistent, Contained):
@@ -56,4 +56,4 @@
 
 deprecated('LocalUtilityService',
            'Services have been removed. Use site manager API. '
-           'The reference will be gone in X3.3.')
+           'The reference will be gone in Zope 3.3.')

Modified: Zope3/trunk/src/zope/app/zapi/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/zapi/__init__.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/app/zapi/__init__.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -47,4 +47,4 @@
 
 deprecated('servicenames',
            'The concept of services has been removed. Please use utilities '
-           'instead. This reference will be removed in Zope X3.3.')
+           'instead. This reference will be removed in Zope 3.3.')

Modified: Zope3/trunk/src/zope/server/http/publisherhttpserver.py
===================================================================
--- Zope3/trunk/src/zope/server/http/publisherhttpserver.py	2005-10-11 18:26:14 UTC (rev 39057)
+++ Zope3/trunk/src/zope/server/http/publisherhttpserver.py	2005-10-11 18:31:25 UTC (rev 39058)
@@ -68,4 +68,4 @@
     ('PublisherHTTPServer', 'PMDBHTTPServer'),
     'This plain publisher support has been replaced in favor of the '
     'WSGI HTTP server '
-    'The reference will be gone in X3.4.')
+    'The reference will be gone in Zope 3.4.')



More information about the Zope3-Checkins mailing list