[Checkins] SVN: zope.index/trunk/ Dropp support for Python 2.4 and 2.5.
Tres Seaver
cvs-admin at zope.org
Fri May 18 13:20:16 UTC 2012
Log message for revision 126083:
Dropp support for Python 2.4 and 2.5.
Replace deprecated 'zope.interface.implements' usage with equivalent
'zope.interface.implementer' decorator.
Changed:
U zope.index/trunk/CHANGES.txt
U zope.index/trunk/setup.py
U zope.index/trunk/src/zope/index/field/index.py
U zope.index/trunk/src/zope/index/field/sorting.py
U zope.index/trunk/src/zope/index/keyword/index.py
U zope.index/trunk/src/zope/index/nbest.py
U zope.index/trunk/src/zope/index/text/baseindex.py
U zope.index/trunk/src/zope/index/text/htmlsplitter.py
U zope.index/trunk/src/zope/index/text/lexicon.py
U zope.index/trunk/src/zope/index/text/parsetree.py
U zope.index/trunk/src/zope/index/text/queryparser.py
U zope.index/trunk/src/zope/index/text/textindex.py
U zope.index/trunk/src/zope/index/topic/filter.py
U zope.index/trunk/src/zope/index/topic/index.py
-=-
Modified: zope.index/trunk/CHANGES.txt
===================================================================
--- zope.index/trunk/CHANGES.txt 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/CHANGES.txt 2012-05-18 13:20:12 UTC (rev 126083)
@@ -1,11 +1,14 @@
Changes
=======
-3.6.5 (unreleased)
+4.0.0 (unreleased)
------------------
-- TBD
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+ ``zope.interface.implementer`` decorator.
+- Dropped support for Python 2.4 and 2.5.
+
3.6.4 (2012-03-12)
------------------
Modified: zope.index/trunk/setup.py
===================================================================
--- zope.index/trunk/setup.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/setup.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -61,13 +61,26 @@
print >> sys.stderr, '*' * 80
setup(name='zope.index',
- version='3.6.5dev',
+ version='4.0.0dev',
url='http://pypi.python.org/pypi/zope.index',
license='ZPL 2.1',
author='Zope Foundation and Contributors',
author_email='zope-dev at zope.org',
description="Indices for using with catalog like text, field, etc.",
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.index/trunk/src/zope/index/field/index.py
===================================================================
--- zope.index/trunk/src/zope/index/field/index.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/field/index.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -21,13 +21,12 @@
from zope.index import interfaces
from zope.index.field.sorting import SortingIndexMixin
-class FieldIndex(SortingIndexMixin, persistent.Persistent):
-
- zope.interface.implements(
+ at zope.interface.implementer(
interfaces.IInjection,
interfaces.IStatistics,
interfaces.IIndexSearch,
)
+class FieldIndex(SortingIndexMixin, persistent.Persistent):
family = BTrees.family32
Modified: zope.index/trunk/src/zope/index/field/sorting.py
===================================================================
--- zope.index/trunk/src/zope/index/field/sorting.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/field/sorting.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -17,13 +17,12 @@
import bisect
from itertools import islice
-from zope.interface import implements
+from zope.interface import implementer
from zope.index.interfaces import IIndexSort
+ at implementer(IIndexSort)
class SortingIndexMixin(object):
- implements(IIndexSort)
-
_sorting_num_docs_attr = '_num_docs' # Length object
_sorting_fwd_index_attr = '_fwd_index' # forward BTree index
_sorting_rev_index_attr = '_rev_index' # reverse BTree index
Modified: zope.index/trunk/src/zope/index/keyword/index.py
===================================================================
--- zope.index/trunk/src/zope/index/keyword/index.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/keyword/index.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -21,13 +21,13 @@
from zope.index.interfaces import IInjection, IStatistics, IIndexSearch
from zope.index.keyword.interfaces import IKeywordQuerying
-from zope.interface import implements
+from zope.interface import implementer
+ at implementer(IInjection, IStatistics, IIndexSearch, IKeywordQuerying)
class KeywordIndex(Persistent):
"""Keyword index"""
- implements(IInjection, IStatistics, IIndexSearch, IKeywordQuerying)
family = BTrees.family32
# If a word is referenced by at least tree_threshold docids,
Modified: zope.index/trunk/src/zope/index/nbest.py
===================================================================
--- zope.index/trunk/src/zope/index/nbest.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/nbest.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -21,10 +21,10 @@
from bisect import bisect_left as bisect
from zope.index.interfaces import INBest
-from zope.interface import implements
+from zope.interface import implementer
+ at implementer(INBest)
class NBest(object):
- implements(INBest)
def __init__(self, N):
"Build an NBest object to remember the N best-scoring objects."
Modified: zope.index/trunk/src/zope/index/text/baseindex.py
===================================================================
--- zope.index/trunk/src/zope/index/text/baseindex.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/text/baseindex.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -16,7 +16,7 @@
import math
from persistent import Persistent
-from zope.interface import implements
+from zope.interface import implementer
import BTrees
from BTrees import Length
@@ -30,8 +30,8 @@
from zope.index.text.setops import mass_weightedIntersection
from zope.index.text.setops import mass_weightedUnion
+ at implementer(IInjection, IStatistics, ILexiconBasedIndex, IExtendedQuerying)
class BaseIndex(Persistent):
- implements(IInjection, IStatistics, ILexiconBasedIndex, IExtendedQuerying)
family = BTrees.family32
Modified: zope.index/trunk/src/zope/index/text/htmlsplitter.py
===================================================================
--- zope.index/trunk/src/zope/index/text/htmlsplitter.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/text/htmlsplitter.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -15,7 +15,7 @@
"""
import re
-from zope.interface import implements
+from zope.interface import implementer
from zope.index.text.interfaces import ISplitter
@@ -23,10 +23,9 @@
WORDS = re.compile(r"(?L)\w+")
GLOBS = re.compile(r"(?L)\w+[\w*?]*")
+ at implementer(ISplitter)
class HTMLWordSplitter(object):
- implements(ISplitter)
-
def process(self, text):
return self._apply(text, WORDS)
Modified: zope.index/trunk/src/zope/index/text/lexicon.py
===================================================================
--- zope.index/trunk/src/zope/index/text/lexicon.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/text/lexicon.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -15,7 +15,7 @@
"""
import re
-from zope.interface import implements
+from zope.interface import implementer
from BTrees.IOBTree import IOBTree
from BTrees.OIBTree import OIBTree
@@ -30,9 +30,9 @@
from zope.index.text.parsetree import QueryError
+ at implementer(ILexicon)
class Lexicon(Persistent):
- implements(ILexicon)
def __init__(self, *pipeline):
self._wids = OIBTree() # word -> wid
self._words = IOBTree() # wid -> word
@@ -164,8 +164,8 @@
# Sample pipeline elements
+ at implementer(ISplitter)
class Splitter(object):
- implements(ISplitter)
rx = re.compile(r"(?u)\w+")
rxGlob = re.compile(r"(?u)\w+[\w*?]*") # See globToWordIds() above
@@ -182,14 +182,14 @@
result += self.rxGlob.findall(s)
return result
+ at implementer(IPipelineElement)
class CaseNormalizer(object):
- implements(IPipelineElement)
def process(self, lst):
return [w.lower() for w in lst]
+ at implementer(IPipelineElement)
class StopWordRemover(object):
- implements(IPipelineElement)
dict = get_stopdict().copy()
Modified: zope.index/trunk/src/zope/index/text/parsetree.py
===================================================================
--- zope.index/trunk/src/zope/index/text/parsetree.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/text/parsetree.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -17,7 +17,7 @@
from zope.index.text.setops import mass_weightedIntersection
from zope.index.text.setops import mass_weightedUnion
-from zope.interface import implements
+from zope.interface import implementer
class QueryError(Exception):
pass
@@ -25,10 +25,9 @@
class ParseError(Exception):
pass
+ at implementer(IQueryParseTree)
class ParseTreeNode(object):
- implements(IQueryParseTree)
-
_nodeType = None
def __init__(self, value):
Modified: zope.index/trunk/src/zope/index/text/queryparser.py
===================================================================
--- zope.index/trunk/src/zope/index/text/queryparser.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/text/queryparser.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -55,7 +55,7 @@
"""
import re
-from zope.interface import implements
+from zope.interface import implementer
from zope.index.text.interfaces import IQueryParser
from zope.index.text import parsetree
@@ -93,10 +93,9 @@
)
""", re.VERBOSE)
+ at implementer(IQueryParser)
class QueryParser(object):
- implements(IQueryParser)
-
# This class is not thread-safe;
# each thread should have its own instance
Modified: zope.index/trunk/src/zope/index/text/textindex.py
===================================================================
--- zope.index/trunk/src/zope/index/text/textindex.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/text/textindex.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -16,7 +16,7 @@
import sys
from persistent import Persistent
-from zope.interface import implements
+from zope.interface import implementer
from zope.index.interfaces import IIndexSearch
from zope.index.interfaces import IInjection
@@ -28,10 +28,9 @@
from zope.index.text.okapiindex import OkapiIndex
from zope.index.text.queryparser import QueryParser
+ at implementer(IInjection, IIndexSearch, IStatistics)
class TextIndex(Persistent):
- implements(IInjection, IIndexSearch, IStatistics)
-
def __init__(self, lexicon=None, index=None):
"""Provisional constructor.
Modified: zope.index/trunk/src/zope/index/topic/filter.py
===================================================================
--- zope.index/trunk/src/zope/index/topic/filter.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/topic/filter.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -17,8 +17,9 @@
import BTrees
from zope.index.topic.interfaces import ITopicFilteredSet
-from zope.interface import implements
+from zope.interface import implementer
+ at implementer(ITopicFilteredSet)
class FilteredSetBase(object):
""" Base class for all filtered sets.
@@ -27,8 +28,6 @@
by a condition.
"""
- implements(ITopicFilteredSet)
-
family = BTrees.family32
def __init__(self, id, expr, family=None):
Modified: zope.index/trunk/src/zope/index/topic/index.py
===================================================================
--- zope.index/trunk/src/zope/index/topic/index.py 2012-05-18 13:14:03 UTC (rev 126082)
+++ zope.index/trunk/src/zope/index/topic/index.py 2012-05-18 13:20:12 UTC (rev 126083)
@@ -17,16 +17,15 @@
import BTrees
-from zope.interface import implements
+from zope.interface import implementer
from zope.index.interfaces import IInjection, IIndexSearch
from zope.index.topic.interfaces import ITopicQuerying
+ at implementer(IInjection, ITopicQuerying, IIndexSearch)
class TopicIndex(Persistent):
- implements(IInjection, ITopicQuerying, IIndexSearch)
-
family = BTrees.family32
def __init__(self, family=None):
More information about the checkins
mailing list