[Checkins] SVN: zope.traversing/trunk/ Drop support for Python 2.4 and 2.5.
Tres Seaver
cvs-admin at zope.org
Thu May 17 23:23:48 UTC 2012
Log message for revision 126019:
Drop support for Python 2.4 and 2.5.
Replace deprecated 'zope.component.adapts' usage with equivalent
'zope.component.adapter' decorator.
Replace deprecated 'zope.interface.implements' usage with equivalent
'zope.interface.implementer' decorator.
Changed:
U zope.traversing/trunk/CHANGES.txt
U zope.traversing/trunk/setup.py
U zope.traversing/trunk/src/zope/traversing/adapters.py
U zope.traversing/trunk/src/zope/traversing/browser/absoluteurl.py
U zope.traversing/trunk/src/zope/traversing/browser/tests.py
U zope.traversing/trunk/src/zope/traversing/interfaces.py
U zope.traversing/trunk/src/zope/traversing/namespace.py
U zope.traversing/trunk/src/zope/traversing/tests/test_physicallocationadapters.py
U zope.traversing/trunk/src/zope/traversing/tests/test_presentation.py
U zope.traversing/trunk/src/zope/traversing/tests/test_publicationtraverse.py
-=-
Modified: zope.traversing/trunk/CHANGES.txt
===================================================================
--- zope.traversing/trunk/CHANGES.txt 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/CHANGES.txt 2012-05-17 23:23:25 UTC (rev 126019)
@@ -2,9 +2,17 @@
Changes
=======
-3.14.1 (unreleased)
+4.0.0 (unreleased)
-------------------
+- Replaced deprecated ``zope.component.adapts`` usage with equivalent
+ ``zope.component.adapter`` decorator.
+
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+ ``zope.interface.implementer`` decorator.
+
+- Dropped support for Python 2.4 and 2.5.
+
- Fixed dependencies : removed ``zope.tal`` and added ``zope.browserpage``.
- ...
Modified: zope.traversing/trunk/setup.py
===================================================================
--- zope.traversing/trunk/setup.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/setup.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -25,14 +25,26 @@
open('CHANGES.txt').read())
setup(name='zope.traversing',
- version='3.14.1dev',
+ version='4.0.0dev',
url='http://pypi.python.org/pypi/zope.traversing',
license='ZPL 2.1',
author='Zope Foundation and Contributors',
author_email='zope-dev at zope.org',
description="Resolving paths in the object hierarchy",
long_description=long_description,
-
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'Topic :: Internet :: WWW/HTTP',
+ 'Topic :: Software Development',
+ ],
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope',],
Modified: zope.traversing/trunk/src/zope/traversing/adapters.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/adapters.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/adapters.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -28,9 +28,9 @@
_marker = object() # opaque marker that doesn't get security proxied
+ at zope.interface.implementer(ITraversable)
class DefaultTraversable(object):
"""Traverses objects via attribute and item lookup"""
- zope.interface.implements(ITraversable)
def __init__(self, subject):
self._subject = subject
@@ -49,11 +49,10 @@
raise LocationError(subject, name)
+ at zope.interface.implementer(ITraverser)
class Traverser(object):
"""Provide traverse features"""
- zope.interface.implements(ITraverser)
-
# This adapter can be used for any object.
def __init__(self, wrapper):
Modified: zope.traversing/trunk/src/zope/traversing/browser/absoluteurl.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/browser/absoluteurl.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/browser/absoluteurl.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -15,7 +15,7 @@
"""
import urllib
import zope.component
-from zope.interface import implements
+from zope.interface import implementer
from zope.location.interfaces import ILocation
from zope.proxy import sameProxiedObjects
from zope.publisher.browser import BrowserView
@@ -34,8 +34,8 @@
return zope.component.getMultiAdapter((ob, request), IAbsoluteURL)()
+ at implementer(IAbsoluteURL)
class AbsoluteURL(BrowserView):
- implements(IAbsoluteURL)
def __unicode__(self):
return urllib.unquote(self.__str__()).decode('utf-8')
@@ -113,8 +113,8 @@
return base
+ at implementer(IAbsoluteURL)
class SiteAbsoluteURL(BrowserView):
- implements(IAbsoluteURL)
def __unicode__(self):
return urllib.unquote(self.__str__()).decode('utf-8')
Modified: zope.traversing/trunk/src/zope/traversing/browser/tests.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/browser/tests.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/browser/tests.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -16,13 +16,13 @@
from unittest import TestCase, main, makeSuite
import zope.component
-from zope.component import getMultiAdapter, adapts
+from zope.component import getMultiAdapter, adapter
from zope.component.testing import PlacelessSetup
from zope.traversing.browser.absoluteurl import absoluteURL
from zope.traversing.browser.interfaces import IAbsoluteURL
from zope.traversing.testing import browserView
from zope.i18n.interfaces import IUserPreferredCharsets
-from zope.interface import Interface, implements
+from zope.interface import Interface, implementer
from zope.interface.verify import verifyObject
from zope.publisher.browser import TestRequest
from zope.publisher.http import IHTTPRequest, HTTPCharsets
@@ -36,8 +36,9 @@
pass
+ at implementer(IRoot)
class Root(object):
- implements(IRoot)
+ pass
class TrivialContent(object):
@@ -52,10 +53,10 @@
"""Class whose location will be provided by an adapter."""
+ at implementer(ILocation)
+ at adapter(FooContent)
class FooLocation(object):
"""Adapts FooAdapter to the ILocation protocol."""
- implements(ILocation)
- adapts(FooContent)
def __init__(self, context):
self.context = context
Modified: zope.traversing/trunk/src/zope/traversing/interfaces.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/interfaces.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/interfaces.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -16,7 +16,7 @@
from zope.interface import Attribute
from zope.interface import Interface
-from zope.interface import implements
+from zope.interface import implementer
from zope.component.interfaces import IObjectEvent
# BBB: Re-import symbols to their old location.
@@ -179,10 +179,10 @@
request = Attribute("The current request")
+ at implementer(IBeforeTraverseEvent)
class BeforeTraverseEvent(object):
"""An event which gets sent on publication traverse"""
- implements(IBeforeTraverseEvent)
def __init__(self, ob, request):
self.object = ob
Modified: zope.traversing/trunk/src/zope/traversing/namespace.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/namespace.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/namespace.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -49,8 +49,9 @@
>>> class I(zope.interface.Interface):
... 'Test interface'
- >>> class C(object):
- ... zope.interface.implements(I)
+ >>> @zope.interface.implementer(I)
+ ... class C(object):
+ ... pass
We'll register a simple testing adapter:
@@ -182,10 +183,9 @@
# ---- namespace processors below ----
+ at zope.interface.implementer(ITraversable)
class SimpleHandler(object):
- zope.interface.implements(ITraversable)
-
def __init__(self, context, request=None):
"""Simple handlers can be used as adapters or views
@@ -210,8 +210,8 @@
Let's set up some example data:
- >>> class testcontent(object):
- ... zope.interface.implements(ITraversable)
+ >>> @zope.interface.implementer(ITraversable)
+ ... class testcontent(object):
... def traverse(self, name, remaining):
... v = getattr(self, name, None)
... if v is None:
@@ -324,10 +324,9 @@
raise LocationError(ob, name)
+ at zope.interface.implementer(ITraversable)
class view(object):
- zope.interface.implements(ITraversable)
-
def __init__(self, context, request):
self.context = context
self.request = request
Modified: zope.traversing/trunk/src/zope/traversing/tests/test_physicallocationadapters.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/test_physicallocationadapters.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/tests/test_physicallocationadapters.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -16,7 +16,7 @@
from unittest import TestCase, main, makeSuite
from zope.container.contained import contained
-from zope.interface import implements
+from zope.interface import implementer
from zope.location.interfaces import ILocationInfo, IRoot
from zope.site.site import LocalSiteManager
from zope.site.site import SiteManagerContainer
@@ -25,8 +25,8 @@
import zope.traversing.testing
+ at implementer(IRoot)
class Root(object):
- implements(IRoot)
__parent__ = None
Modified: zope.traversing/trunk/src/zope/traversing/tests/test_presentation.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/test_presentation.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/tests/test_presentation.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -15,7 +15,7 @@
"""
from unittest import TestCase, main, makeSuite
from zope.testing.cleanup import CleanUp
-from zope.interface import Interface, implements
+from zope.interface import Interface, implementer
from zope.publisher.browser import TestRequest
from zope.traversing.namespace import view, resource
from zope.traversing.testing import browserView, browserResource
@@ -23,8 +23,9 @@
class IContent(Interface):
pass
+ at implementer(IContent)
class Content(object):
- implements(IContent)
+ pass
class Resource(object):
Modified: zope.traversing/trunk/src/zope/traversing/tests/test_publicationtraverse.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/test_publicationtraverse.py 2012-05-17 23:20:03 UTC (rev 126018)
+++ zope.traversing/trunk/src/zope/traversing/tests/test_publicationtraverse.py 2012-05-17 23:23:25 UTC (rev 126019)
@@ -16,7 +16,7 @@
from unittest import TestCase, main, makeSuite
from zope.testing.cleanup import CleanUp
from zope.component import provideAdapter
-from zope.interface import Interface, implements
+from zope.interface import Interface, implementer
from zope.publisher.browser import TestRequest
from zope.publisher.interfaces import IPublishTraverse
from zope.publisher.interfaces import NotFound
@@ -144,15 +144,16 @@
class IContent(Interface):
pass
+ at implementer(IContent)
class Content(object):
- implements(IContent)
+ pass
class View(object):
def __init__(self, name):
self.name = name
+ at implementer(ITraversable)
class DummyViewTraverser(object):
- implements(ITraversable)
def __init__(self, content, request):
self.content = content
@@ -160,8 +161,8 @@
def traverse(self, name, furtherPath):
return View(name)
+ at implementer(IPublishTraverse)
class DummyPublishTraverse(object):
- implements(IPublishTraverse)
def __init__(self, context, request):
pass
@@ -169,8 +170,8 @@
def publishTraverse(self, request, name):
return View(name)
+ at implementer(IBrowserPublisher)
class DummyBrowserPublisher(object):
- implements(IBrowserPublisher)
def __init__(self, context):
self.context = removeSecurityProxy(context)
More information about the checkins
mailing list