Skip to content

Commit

Permalink
Update Python version support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@icemac
icemac committed Dec 2, 2024
1 parent 4a3068e commit 614d498
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 53 deletions.
1 change: 1 addition & 0 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Internet :: WWW/HTTP :: Indexing/Search",
],
Expand Down
12 changes: 6 additions & 6 deletions src/Products/PluginIndexes/BooleanIndex/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@ def test_index_true(self):
index = self._makeOne()
obj = Dummy(1, True)
index._index_object(obj.id, obj, attr='truth')
self.assertTrue(1 in index._unindex)
self.assertFalse(1 in index._index)
self.assertIn(1, index._unindex)
self.assertNotIn(1, index._index)

def test_index_false(self):
index = self._makeOne()
obj = Dummy(1, False)
index._index_object(obj.id, obj, attr='truth')
self.assertTrue(1 in index._unindex)
self.assertFalse(1 in index._index)
self.assertIn(1, index._unindex)
self.assertNotIn(1, index._index)

def test_index_missing_attribute(self):
index = self._makeOne()
obj = Dummy(1, True)
index._index_object(obj.id, obj, attr='missing')
self.assertFalse(1 in index._unindex)
self.assertFalse(1 in index._index)
self.assertNotIn(1, index._unindex)
self.assertNotIn(1, index._index)

def test_search_true(self):
index = self._makeOne()
Expand Down
16 changes: 8 additions & 8 deletions src/Products/PluginIndexes/DateIndex/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def checkApply():
self.assertEqual(len(result), len(expectedValues),
f'{req}: {result} | {expectedValues}')
for k, v in expectedValues:
self.assertTrue(k in result)
self.assertIn(k, result)

cache = index.getRequestCache()
cache.clear()
Expand Down Expand Up @@ -221,16 +221,16 @@ def test_empty(self):
self.assertEqual(len(index), 0)
self.assertEqual(len(index.referencedObjects()), 0)

self.assertTrue(index.getEntryForObject(1234) is None)
self.assertIsNone(index.getEntryForObject(1234))
marker = []
self.assertTrue(index.getEntryForObject(1234, marker) is marker)
self.assertIs(index.getEntryForObject(1234, marker), marker)
index.unindex_object(1234) # shouldn't throw

self.assertTrue(index.hasUniqueValuesFor('date'))
self.assertFalse(index.hasUniqueValuesFor('foo'))
self.assertEqual(len(list(index.uniqueValues('date'))), 0)

self.assertTrue(index._apply_index({'zed': 12345}) is None)
self.assertIsNone(index._apply_index({'zed': 12345}))

self._checkApply(index,
{'date': DateTime(0)}, [])
Expand Down Expand Up @@ -260,9 +260,9 @@ def test_retrieval(self):
# One empty
self.assertEqual(len(index.referencedObjects()), len(values) - 1)

self.assertTrue(index.getEntryForObject(1234) is None)
self.assertIsNone(index.getEntryForObject(1234))
marker = []
self.assertTrue(index.getEntryForObject(1234, marker) is marker)
self.assertIs(index.getEntryForObject(1234, marker), marker)
index.unindex_object(1234) # shouldn't throw

for k, v in values:
Expand All @@ -272,7 +272,7 @@ def test_retrieval(self):

self.assertEqual(
len(list(index.uniqueValues('date'))), len(values) - 2)
self.assertTrue(index._apply_index({'bar': 123}) is None)
self.assertIsNone(index._apply_index({'bar': 123}))

self._checkApply(index,
{'date': DateTime(0)}, values[1:2])
Expand Down Expand Up @@ -334,7 +334,7 @@ def test_removal(self):
self._checkApply(index,
{'date': 1072742900}, [values[7]])
index.index_object(7, None)
self.assertFalse(7 in index.documentToKeyMap().keys())
self.assertNotIn(7, index.documentToKeyMap().keys())

def test_getCounter(self):
from DateTime import DateTime
Expand Down
8 changes: 4 additions & 4 deletions src/Products/PluginIndexes/DateRangeIndex/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ def test_interfaces(self):
def test_empty(self):
empty = self._makeOne('empty')

self.assertTrue(empty.getEntryForObject(1234) is None)
self.assertIsNone(empty.getEntryForObject(1234))
empty.unindex_object(1234) # shouldn't throw

self.assertFalse(list(empty.uniqueValues('foo')))
self.assertFalse(list(empty.uniqueValues('foo', withLengths=True)))
self.assertTrue(empty._apply_index({'zed': 12345}) is None)
self.assertIsNone(empty._apply_index({'zed': 12345}))

self._checkApply(empty, {'empty': 12345}, [])

Expand Down Expand Up @@ -193,14 +193,14 @@ def test_floor_date(self):
floor = index.floor_value - 1
bad = Dummy('bad', floor, None)
index.index_object(0, bad)
self.assertTrue(0 in index._always.keys())
self.assertIn(0, index._always.keys())

def test_ceiling_date(self):
index = self._makeOne('work', 'start', 'stop')
ceiling = index.ceiling_value + 1
bad = Dummy('bad', None, ceiling)
index.index_object(1, bad)
self.assertTrue(1 in index._always.keys())
self.assertIn(1, index._always.keys())

def test_datetime(self):
from Products.PluginIndexes.DateIndex.tests import _getEastern
Expand Down
4 changes: 2 additions & 2 deletions src/Products/PluginIndexes/FieldIndex/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def checkApply():
assert len(result) == len(expectedValues), \
f'{list(result)} | {expectedValues}'
for k, v in expectedValues:
self.assertTrue(k in result)
self.assertIn(k, result)

index = self._index

Expand Down Expand Up @@ -214,7 +214,7 @@ def testPopulated(self):
def testNone(self):
# Make sure None is ignored.
self._index.index_object(10, Dummy(None))
self.assertFalse(None in self._index.uniqueValues('foo'))
self.assertNotIn(None, self._index.uniqueValues('foo'))
self._checkApply({'foo': None}, [])

def testReindexNone(self):
Expand Down
2 changes: 1 addition & 1 deletion src/Products/PluginIndexes/PathIndex/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_getEntryForObject_miss_no_default(self):
def test_getEntryForObject_miss_w_default(self):
index = self._makeOne()
default = object()
self.assertTrue(index.getEntryForObject(1234, default) is default)
self.assertIs(index.getEntryForObject(1234, default), default)

def test_getEntryForObject_hit(self):
index = self._makeOne()
Expand Down
6 changes: 3 additions & 3 deletions src/Products/PluginIndexes/UUIDIndex/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def checkApply():
self.assertEqual(used, ('foo', ))
self.assertEqual(len(result), len(expectedValues))
for k, v in expectedValues:
self.assertTrue(k in result)
self.assertIn(k, result)

index = self._index

Expand Down Expand Up @@ -134,7 +134,7 @@ def test_populated(self):
values = self._values
self.assertEqual(len(self._index), len(values))
self.assertEqual(self._index.indexSize(), len(values))
self.assertTrue(self._index.getEntryForObject(10) is None)
self.assertIsNone(self._index.getEntryForObject(10))
self._checkApply({'foo': 'not'}, [])

self._index.unindex_object(10) # nothrow
Expand All @@ -156,7 +156,7 @@ def test_populated(self):
def test_none(self):
# Make sure None is ignored.
self._index.index_object(10, Dummy(None))
self.assertFalse(None in self._index.uniqueValues('foo'))
self.assertNotIn(None, self._index.uniqueValues('foo'))
self._checkApply({'foo': None}, [])

def test_reindex(self):
Expand Down
8 changes: 4 additions & 4 deletions src/Products/ZCTextIndex/tests/testLexicon.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def process_post_glob(self, lst):
wids = lexicon.sourceToWordIds('cats and dogs')
wids = lexicon.termToWordIds('dogs')
self.assertEqual(len(wids), 1)
self.assertTrue(wids[0] > 0)
self.assertGreater(wids[0], 0)

def testMissingTermToWordIdsWithProcess_post_glob(self):
"""This test is for added process_post_glob"""
Expand All @@ -156,7 +156,7 @@ def testOnePipelineElement(self):
wids = lexicon.sourceToWordIds('cats and dogs')
wids = lexicon.termToWordIds('fish')
self.assertEqual(len(wids), 1)
self.assertTrue(wids[0] > 0)
self.assertGreater(wids[0], 0)

def testSplitterAdaptorFold(self):
from Products.ZCTextIndex.Lexicon import CaseNormalizer
Expand Down Expand Up @@ -189,7 +189,7 @@ def testTwoElementPipeline(self):
wids = lexicon.sourceToWordIds('cats and dogs')
wids = lexicon.termToWordIds('hsif')
self.assertEqual(len(wids), 1)
self.assertTrue(wids[0] > 0)
self.assertGreater(wids[0], 0)

def testThreeElementPipeline(self):
from Products.ZCTextIndex.Lexicon import Splitter
Expand All @@ -202,7 +202,7 @@ def testThreeElementPipeline(self):
wids = lexicon.sourceToWordIds('cats and dogs')
wids = lexicon.termToWordIds('hsif')
self.assertEqual(len(wids), 1)
self.assertTrue(wids[0] > 0)
self.assertGreater(wids[0], 0)

def testSplitterLocaleAwareness(self):
import locale
Expand Down
12 changes: 8 additions & 4 deletions src/Products/ZCatalog/tests/test_brains.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,10 @@ def testGetObjectHappy(self):
self.root.REQUEST = request
self.assertEqual(b.getPath(), '/happy')
self.assertEqual(b.getObject().REQUEST, request)
self.assertTrue(aq_base(b.getObject()) is
aq_base(self.cat.getobject(1)))
self.assertIs(
aq_base(b.getObject()),
aq_base(self.cat.getobject(1))
)

def testGetObjectHappy_catalog_as_utility(self):
request = DummyRequest()
Expand All @@ -172,8 +174,10 @@ def testGetObjectHappy_catalog_as_utility(self):
setRequest(request)
self.assertEqual(b.getPath(), '/happy')
self.assertEqual(b.getObject().REQUEST, request)
self.assertTrue(aq_base(b.getObject()) is
aq_base(self.cat.getobject(1)))
self.assertIs(
aq_base(b.getObject()),
aq_base(self.cat.getobject(1))
)
clearRequest()

def testGetObjectPropagatesConflictErrors(self):
Expand Down
32 changes: 16 additions & 16 deletions src/Products/ZCatalog/tests/test_catalog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def _make_one(self, extra=None):

def test_clear(self):
catalog = self._make_one()
self.assertTrue(len(catalog) > 0)
self.assertGreater(len(catalog), 0)
catalog.clear()
self.assertEqual(catalog._length(), 0)
self.assertEqual(len(catalog), 0)
Expand Down Expand Up @@ -351,7 +351,7 @@ def extra(catalog):
col1 = FieldIndex('col1')
catalog.addIndex('col1', col1)
catalog = self._make_one(extra=extra)
self.assertTrue(len(catalog) > 0)
self.assertGreater(len(catalog), 0)
all_data = catalog({})
self.assertEqual(len(all_data), 0)

Expand Down Expand Up @@ -737,7 +737,7 @@ def test_sort_on_two_reverse(self):
sort_order='reverse')
self.assertEqual(len(a), upper)
for x in range(upper - 1):
self.assertTrue(a[x].num > a[x + 1].num)
self.assertGreater(a[x].num, a[x + 1].num)

def test_sort_on_two_reverse_with_limit(self):
catalog = self._make_one()
Expand Down Expand Up @@ -768,7 +768,7 @@ def test_sort_on_two_reverse_neither(self):
sort_order=('', ''))
self.assertEqual(len(a), upper)
for x in range(upper - 1):
self.assertTrue(a[x].num < a[x + 1].num)
self.assertLess(a[x].num, a[x + 1].num)

def test_sort_on_two_reverse_first(self):
catalog = self._make_one()
Expand All @@ -777,7 +777,7 @@ def test_sort_on_two_reverse_first(self):
sort_order=('reverse', ''))
self.assertEqual(len(a), upper)
for x in range(upper - 1):
self.assertTrue(a[x].num < a[x + 1].num)
self.assertLess(a[x].num, a[x + 1].num)

def test_sort_on_two_reverse_second(self):
catalog = self._make_one()
Expand All @@ -786,7 +786,7 @@ def test_sort_on_two_reverse_second(self):
sort_order=('', 'reverse'))
self.assertEqual(len(a), upper)
for x in range(upper - 1):
self.assertTrue(a[x].num > a[x + 1].num)
self.assertGreater(a[x].num, a[x + 1].num)

def test_sort_on_two_reverse_both(self):
catalog = self._make_one()
Expand All @@ -795,7 +795,7 @@ def test_sort_on_two_reverse_both(self):
sort_order=('reverse', 'reverse'))
self.assertEqual(len(a), upper)
for x in range(upper - 1):
self.assertTrue(a[x].num > a[x + 1].num)
self.assertGreater(a[x].num, a[x + 1].num)

def test_sort_on_two_reverse_too_many(self):
catalog = self._make_one()
Expand All @@ -804,38 +804,38 @@ def test_sort_on_two_reverse_too_many(self):
sort_order=('', '', 'reverse', ''))
self.assertEqual(len(a), upper)
for x in range(upper - 1):
self.assertTrue(a[x].num < a[x + 1].num)
self.assertLess(a[x].num, a[x + 1].num)

def test_sort_on_two_small_limit(self):
catalog = self._make_one()
a = catalog(sort_on=('att1', 'num'), att1='att1', sort_limit=10)
self.assertEqual(len(a), 10)
for x in range(9):
self.assertTrue(a[x].num < a[x + 1].num)
self.assertLess(a[x].num, a[x + 1].num)

def test_sort_on_two_small_limit_reverse(self):
catalog = self._make_one()
a = catalog(sort_on=('att1', 'num'), att1='att1',
sort_limit=10, sort_order='reverse')
self.assertEqual(len(a), 10)
for x in range(9):
self.assertTrue(a[x].num > a[x + 1].num)
self.assertGreater(a[x].num, a[x + 1].num)

def test_sort_on_two_big_limit(self):
catalog = self._make_one()
a = catalog(sort_on=('att1', 'num'), att1='att1',
sort_limit=self.upper * 3)
self.assertEqual(len(a), 100)
for x in range(99):
self.assertTrue(a[x].num < a[x + 1].num)
self.assertLess(a[x].num, a[x + 1].num)

def test_sort_on_two_big_limit_reverse(self):
catalog = self._make_one()
a = catalog(sort_on=('att1', 'num'), att1='att1',
sort_limit=self.upper * 3, sort_order='reverse')
self.assertEqual(len(a), 100)
for x in range(99):
self.assertTrue(a[x].num > a[x + 1].num)
self.assertGreater(a[x].num, a[x + 1].num)

def test_sort_on_three(self):
def extra(catalog):
Expand All @@ -856,7 +856,7 @@ def extra(catalog):
sort_order='reverse')
self.assertEqual(len(a), self.upper)
for x in range(self.upper - 1):
self.assertTrue(a[x].num > a[x + 1].num)
self.assertGreater(a[x].num, a[x + 1].num)

def test_sort_on_three_reverse_last(self):
def extra(catalog):
Expand All @@ -867,7 +867,7 @@ def extra(catalog):
sort_order=('', '', 'reverse'))
self.assertEqual(len(a), self.upper)
for x in range(self.upper - 1):
self.assertTrue(a[x].num > a[x + 1].num)
self.assertGreater(a[x].num, a[x + 1].num)

def test_sort_on_three_small_limit(self):
def extra(catalog):
Expand All @@ -878,7 +878,7 @@ def extra(catalog):
sort_limit=10)
self.assertEqual(len(a), 10)
for x in range(9):
self.assertTrue(a[x].num < a[x + 1].num)
self.assertLess(a[x].num, a[x + 1].num)

def test_sort_on_three_big_limit(self):
def extra(catalog):
Expand All @@ -889,7 +889,7 @@ def extra(catalog):
sort_limit=self.upper * 3)
self.assertEqual(len(a), 100)
for x in range(99):
self.assertTrue(a[x].num < a[x + 1].num)
self.assertLess(a[x].num, a[x + 1].num)


class TestUnCatalog(unittest.TestCase):
Expand Down
Loading

0 comments on commit 614d498

Please sign in to comment.