[Zope3-dev] Re: SVN: Zope3/branches/jim-adapter/src/zope/ Redeprecated a number of things that didn't generate warnings

[Philipp von Weitershausen]

Jim Fulton wrote:
> Log message for revision 65931:
>   Redeprecated a number of things that didn't generate warnings
>   before. Sigh. Also fixed all the depecation warnings generated by
>   running the zope.component tests.
>   

...

> Added: Zope3/branches/jim-adapter/src/zope/component/back35.py

I'm certain that the stuff in this file was already deprecated (and
generated deprecation warnings), so I think we can definitely get rid of
it and don't need to keep it around.

...

> ===================================================================
> --- Zope3/branches/jim-adapter/src/zope/component/back35.py	2006-03-12 21:46:52 UTC (rev 65930)
> +++ Zope3/branches/jim-adapter/src/zope/component/back35.py	2006-03-12 21:46:54 UTC (rev 65931)
> @@ -0,0 +1,133 @@
> +##############################################################################
> +#
> +# Copyright (c) 2006 Zope Corporation and Contributors.
> +# All Rights Reserved.
> +#
> +# This software is subject to the provisions of the Zope Public License,
> +# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
> +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
> +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
> +# FOR A PARTICULAR PURPOSE.
> +#
> +##############################################################################
> +"""Features that will be deprecated in Zope 3.5
> +
> +$Id$
> +"""
> +import sys
> +import warnings
> +
> +from zope.interface import Interface, providedBy
> +from zope.component.bbb.interfaces import IServiceService, IDefaultViewName
> +from zope.component.service import GlobalServiceManager
> +
> +# Try to be hookable. Do so in a try/except to avoid a hard dependency.
> +from zope.hookable import hookable
> +
> +def getGlobalServices():
> +    from zope.component import getGlobalSiteManager
> +    return GlobalServiceManager('servicemanager', 'zope.component.service',
> +                                getGlobalSiteManager())
> +
> +def getGlobalService(name):
> +    return getGlobalServices().getService(name)
> +
> +def getServices(context=None):
> +    if context is None:
> +        return getGlobalServices()
> +    else:
> +        # Use the global service manager to adapt context to IServiceService
> +        # to avoid the recursion implied by using a local getAdapter call.
> +        try:
> +            return IServiceService(context)
> +        except TypeError, error:
> +            from zope.component.bbb.exceptions import ComponentLookupError
> +            raise ComponentLookupError(*error.args)
> +
> +getServices = hookable(getServices)
> +
> +def getService(name, context=None):
> +    return getServices(context).getService(name)
> +
> +def getServiceDefinitions(context=None):
> +    return getServices(context).getServiceDefinitions()
> +
> +# Presentation API
> +
> +def getView(object, name, request, providing=Interface, context=None):
> +    view = queryView(object, name, request, context=context,
> +                     providing=providing)
> +    if view is not None:
> +        return view
> +
> +    from zope.component.bbb.exceptions import ComponentLookupError
> +    raise ComponentLookupError("Couldn't find view",
> +                               name, object, context, request, providing)
> +
> +def queryView(object, name, request,
> +              default=None, providing=Interface, context=None):
> +    from zope.component import queryMultiAdapter
> +    return queryMultiAdapter((object, request), providing, name,
> +                             default, context)
> +
> +queryView = hookable(queryView)
> +
> +def getMultiView(objects, request, providing=Interface, name='', context=None):
> +    view = queryMultiView(objects, request, providing, name, context=context)
> +    if view is not None:
> +        return view
> +
> +    from zope.component.bbb.exceptions import ComponentLookupError
> +    raise ComponentLookupError("Couldn't find view",
> +                               name, objects, context, request)
> +
> +def queryMultiView(objects, request, providing=Interface, name='',
> +                   default=None, context=None):
> +    from zope.component import queryMultiAdapter
> +    return queryMultiAdapter(objects+(request,), providing, name,
> +                             default, context)
> +
> +def getViewProviding(object, providing, request, context=None):
> +    return getView(object, '', request, providing, context)
> +
> +def queryViewProviding(object, providing, request, default=None, 
> +                       context=None):
> +    return queryView(object, '', request, default, providing, context)
> +
> +def getDefaultViewName(object, request, context=None):
> +    view = queryDefaultViewName(object, request, context=context)
> +    if view is not None:
> +        return view
> +
> +    from zope.component.bbb.exceptions import ComponentLookupError
> +    raise ComponentLookupError("Couldn't find default view name",
> +                               context, request)
> +
> +def queryDefaultViewName(object, request, default=None, context=None):
> +    from zope.component.bbb.exceptions import ComponentLookupError
> +    from zope.component import getSiteManager
> +    try:
> +        adapters = getSiteManager(context)
> +    except ComponentLookupError:
> +        # Oh blast, no adapter service. We're probably just running from a test
> +        return default
> +
> +    name = adapters.adapters.lookup(map(providedBy, (object, request)),
> +                                    IDefaultViewName)
> +    if name is not None:
> +        return name
> +    return default
> +
> +def getResource(name, request, providing=Interface, context=None):
> +    view = queryResource(name, request, providing=providing, context=context)
> +    if view is not None:
> +        return view
> +
> +    from zope.component.bbb.exceptions import ComponentLookupError
> +    raise ComponentLookupError("Couldn't find resource", name, request)
> +
> +def queryResource(name, request, default=None, providing=Interface,
> +                  context=None):
> +    from zope.component import queryAdapter
> +    return queryAdapter(request, providing, name, default, context)
> 
> 
> Property changes on: Zope3/branches/jim-adapter/src/zope/component/back35.py
> ___________________________________________________________________
> Name: svn:keywords
>    + Id
> Name: svn:eol-style
>    + native
>