[Checkins] SVN: zope.mimetype/trunk/ Drop support for Python 2.4 and 2.5.
Tres Seaver
cvs-admin at zope.org
Fri May 18 14:51:13 UTC 2012
Log message for revision 126116:
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.mimetype/trunk/CHANGES.txt
U zope.mimetype/trunk/setup.py
U zope.mimetype/trunk/src/zope/mimetype/codec.py
U zope.mimetype/trunk/src/zope/mimetype/contentinfo.py
U zope.mimetype/trunk/src/zope/mimetype/contentinfo.txt
U zope.mimetype/trunk/src/zope/mimetype/event.py
U zope.mimetype/trunk/src/zope/mimetype/event.txt
U zope.mimetype/trunk/src/zope/mimetype/source.py
U zope.mimetype/trunk/src/zope/mimetype/widget.txt
-=-
Modified: zope.mimetype/trunk/CHANGES.txt
===================================================================
--- zope.mimetype/trunk/CHANGES.txt 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/CHANGES.txt 2012-05-18 14:51:10 UTC (rev 126116)
@@ -2,12 +2,18 @@
CHANGES
=======
-1.3.2 (unreleased)
+2.0.0 (unreleased)
------------------
-- Nothing changed yet.
+- 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.
+
+
1.3.1 (2010-11-10)
------------------
Modified: zope.mimetype/trunk/setup.py
===================================================================
--- zope.mimetype/trunk/setup.py 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/setup.py 2012-05-18 14:51:10 UTC (rev 126116)
@@ -26,7 +26,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version = '1.3.2dev'
+version = '2.0.0dev'
setup(name='zope.mimetype',
version=version,
@@ -67,6 +67,9 @@
'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',
Modified: zope.mimetype/trunk/src/zope/mimetype/codec.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/codec.py 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/src/zope/mimetype/codec.py 2012-05-18 14:51:10 UTC (rev 126116)
@@ -20,8 +20,8 @@
from zope.mimetype.interfaces import ICharset, ICodecPreferredCharset
+ at interface.implementer(ICodec)
class Codec:
- interface.implements(ICodec)
def __init__(self, name, title):
self.name = name
@@ -38,8 +38,8 @@
component.provideUtility(codec, provides=ICodec, name=name)
+ at interface.implementer(ICharset)
class Charset:
- interface.implements(ICharset)
def __init__(self, name, encoding):
self.name = name
Modified: zope.mimetype/trunk/src/zope/mimetype/contentinfo.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/contentinfo.py 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/src/zope/mimetype/contentinfo.py 2012-05-18 14:51:10 UTC (rev 126116)
@@ -21,15 +21,11 @@
import zope.mimetype.interfaces
+ at zope.interface.implementer(zope.mimetype.interfaces.IContentInfo)
+ at zope.component.adapter(zope.interface.Interface)
class ContentInfo(object):
"""Basic IContentInfo that provides information from an IContentTypeAware.
"""
-
- zope.interface.implements(
- zope.mimetype.interfaces.IContentInfo)
- zope.component.adapts(
- zope.interface.Interface)
-
def __init__(self, context):
self.context = context
aware = zope.mimetype.interfaces.IContentTypeAware(context)
Modified: zope.mimetype/trunk/src/zope/mimetype/contentinfo.txt
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/contentinfo.txt 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/src/zope/mimetype/contentinfo.txt 2012-05-18 14:51:10 UTC (rev 126116)
@@ -23,9 +23,8 @@
>>> import zope.interface
- >>> class Content(object):
- ... zope.interface.implements(interfaces.IContentTypeAware)
- ...
+ >>> @zope.interface.implementer(interfaces.IContentTypeAware)
+ ... class Content(object):
... def __init__(self, mimeType, charset=None):
... self.mimeType = mimeType
... self.parameters = {}
@@ -108,8 +107,8 @@
>>> import codecs
>>> from zope.mimetype.i18n import _
- >>> class Utf8Codec(object):
- ... zope.interface.implements(interfaces.ICodec)
+ >>> @zope.interface.implementer(interfaces.ICodec)
+ ... class Utf8Codec(object):
...
... name = "utf-8"
... title = _("UTF-8")
@@ -123,8 +122,8 @@
>>> utf8_codec = Utf8Codec()
- >>> class Utf8Charset(object):
- ... zope.interface.implements(interfaces.ICharset)
+ >>> @zope.interface.implementer(interfaces.ICharset)
+ ... class Utf8Charset(object):
...
... name = utf8_codec.name
... encoding = name
Modified: zope.mimetype/trunk/src/zope/mimetype/event.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/event.py 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/src/zope/mimetype/event.py 2012-05-18 14:51:10 UTC (rev 126116)
@@ -22,11 +22,9 @@
import zope.security.proxy
+ at zope.interface.implementer(zope.mimetype.interfaces.IContentTypeChangedEvent)
class ContentTypeChangedEvent(zope.component.interfaces.ObjectEvent):
- zope.interface.implements(
- zope.mimetype.interfaces.IContentTypeChangedEvent)
-
def __init__(self, object, oldContentType, newContentType):
super(ContentTypeChangedEvent, self).__init__(object)
self.newContentType = newContentType
Modified: zope.mimetype/trunk/src/zope/mimetype/event.txt
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/event.txt 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/src/zope/mimetype/event.txt 2012-05-18 14:51:10 UTC (rev 126116)
@@ -22,10 +22,8 @@
>>> class IContent(zope.interface.Interface):
... pass
- >>> class Content(object):
- ...
- ... zope.interface.implements(IContent)
- ...
+ >>> @zope.interface.implementer(IContent)
+ ... class Content(object):
... def __str__(self):
... return "<MyContent>"
Modified: zope.mimetype/trunk/src/zope/mimetype/source.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/source.py 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/src/zope/mimetype/source.py 2012-05-18 14:51:10 UTC (rev 126116)
@@ -59,11 +59,10 @@
return self._length
+ at zope.interface.implementer(ITerms)
class Terms(object):
"""Utility to provide terms for content type interfaces."""
- zope.interface.implements(ITerms)
-
def __init__(self, source, request):
self.context = source
self.request = request
@@ -76,22 +75,19 @@
# Source & vocabulary for `IContentTypeInterface` providers
+ at zope.interface.implementer(zope.mimetype.interfaces.IContentTypeSource)
class ContentTypeSource(UtilitySource):
"""Source of IContentTypeInterface providers."""
- zope.interface.implements(
- zope.mimetype.interfaces.IContentTypeSource)
-
_interface = zope.mimetype.interfaces.IContentTypeInterface
+ at zope.component.adapter(
+ zope.mimetype.interfaces.IContentTypeSource,
+ zope.publisher.interfaces.browser.IBrowserRequest)
class ContentTypeTerms(Terms):
"""Utility to provide terms for content type interfaces."""
- zope.component.adapts(
- zope.mimetype.interfaces.IContentTypeSource,
- zope.publisher.interfaces.browser.IBrowserRequest)
-
def getValue(self, token):
module, name = token.rsplit(".", 1)
if module not in sys.modules:
@@ -108,11 +104,9 @@
return ContentTypeTerm(value)
+ at zope.interface.implementer(zope.mimetype.interfaces.IContentTypeTerm)
class ContentTypeTerm(object):
- zope.interface.implements(
- zope.mimetype.interfaces.IContentTypeTerm)
-
def __init__(self, interface):
self.value = interface
@@ -138,22 +132,19 @@
# Source & vocabulary for `IContentTypeInterface` providers
+ at zope.interface.implementer(zope.mimetype.interfaces.ICodecSource)
class CodecSource(UtilitySource):
"""Source of ICodec providers."""
- zope.interface.implements(
- zope.mimetype.interfaces.ICodecSource)
-
_interface = zope.mimetype.interfaces.ICodec
+ at zope.component.adapter(
+ zope.mimetype.interfaces.ICodecSource,
+ zope.publisher.interfaces.browser.IBrowserRequest)
class CodecTerms(Terms):
"""Utility to provide terms for codecs."""
- zope.component.adapts(
- zope.mimetype.interfaces.ICodecSource,
- zope.publisher.interfaces.browser.IBrowserRequest)
-
def getValue(self, token):
codec = zope.component.queryUtility(
zope.mimetype.interfaces.ICodec, token)
@@ -167,9 +158,8 @@
return CodecTerm(value)
+ at zope.interface.implementer(zope.mimetype.interfaces.ICodecTerm)
class CodecTerm(object):
- zope.interface.implements(
- zope.mimetype.interfaces.ICodecTerm)
def __init__(self, codec):
self.value = codec
Modified: zope.mimetype/trunk/src/zope/mimetype/widget.txt
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/widget.txt 2012-05-18 14:44:50 UTC (rev 126115)
+++ zope.mimetype/trunk/src/zope/mimetype/widget.txt 2012-05-18 14:51:10 UTC (rev 126116)
@@ -13,16 +13,16 @@
>>> import zope.schema
>>> import zope.schema.interfaces
- >>> class SourceList(list):
- ... zope.interface.implements(zope.schema.interfaces.IIterableSource)
+ >>> @zope.interface.implementer(zope.schema.interfaces.IIterableSource)
+ ... class SourceList(list):
+ ... pass
>>> import zope.publisher.interfaces.browser
>>> from zope.browser.interfaces import ITerms
>>> from zope.schema.vocabulary import SimpleTerm
- >>> class ListTerms:
+ >>> @zope.interface.implementer(ITerms)
+ ... class ListTerms:
...
- ... zope.interface.implements(ITerms)
- ...
... def __init__(self, source, request):
... pass # We don't actually need the source or the request :)
...
More information about the checkins
mailing list