Skip to content

Commit

Permalink
Avoid DeprecationWarnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sallner
sallner committed May 17, 2018
1 parent 0791f54 commit 0bb711d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/Products/BTreeFolder2/BTreeFolder2.py
View file
Expand Up @@ -190,8 +190,8 @@ def _cleanup(self):
% repr(key))
return 1
except AssertionError:
LOG.warn('Detected damage to %s. Fixing now.' % path,
exc_info=sys.exc_info())
LOG.warning('Detected damage to %s. Fixing now.' % path,
exc_info=sys.exc_info())
try:
self._tree = OOBTree(self._tree)
keys = set(self._tree.keys())
Expand Down
56 changes: 28 additions & 28 deletions src/Products/BTreeFolder2/tests/testBTreeFolder2.py
View file
Expand Up @@ -102,7 +102,7 @@ def testObjectValues(self):
values = self.f.objectValues()
self.assertEqual(len(values), 1)
self.assertEqual(values[0].id, 'item')
self.assert_(values[0].aq_parent is self.f)
self.assertTrue(values[0].aq_parent is self.f)

def testValues(self):
values = self.f.values()
Expand All @@ -115,7 +115,7 @@ def testObjectItems(self):
id, val = items[0]
self.assertEqual(id, 'item')
self.assertEqual(val.id, 'item')
self.assert_(val.aq_parent is self.f)
self.assertTrue(val.aq_parent is self.f)

def testItems(self):
items = self.f.items()
Expand All @@ -125,11 +125,11 @@ def testItems(self):
self.assertEqual(val.id, 'item')

def testHasKey(self):
self.assert_(self.f.hasObject('item')) # Old spelling
self.assert_(self.f.has_key('item')) # NOQA, New spelling
self.assertTrue(self.f.hasObject('item')) # Old spelling
self.assertTrue(self.f.has_key('item')) # NOQA, New spelling

def testContains(self):
self.assert_('item' in self.f)
self.assertTrue('item' in self.f)

def testDelete(self):
self.f._delOb('item')
Expand All @@ -138,13 +138,13 @@ def testDelete(self):

def testDelItem(self):
del self.f['item']
self.assert_('item' not in self.f)
self.assertTrue('item' not in self.f)
self.assertEqual(len(self.f), 0)

def testIter(self):
iterator = iter(self.f)
first = six.next(iterator)
self.assertEquals(first, 'item')
self.assertEqual(first, 'item')
self.assertRaises(StopIteration, six.next, iterator)

def testObjectMap(self):
Expand All @@ -166,16 +166,16 @@ def testCheckId(self):
def testSetObject(self):
f2 = BTreeFolder2('item2')
self.f._setObject(f2.id, f2)
self.assert_('item2' in self.f)
self.assertTrue('item2' in self.f)
self.assertEqual(self.f.objectCount(), 2)

def testWrapped(self):
# Verify that the folder returns wrapped versions of objects.
base = self.getBase(self.f._getOb('item'))
self.assert_(self.f._getOb('item') is not base)
self.assert_(self.f['item'] is not base)
self.assert_(self.f.get('item') is not base)
self.assert_(self.getBase(self.f._getOb('item')) is base)
self.assertTrue(self.f._getOb('item') is not base)
self.assertTrue(self.f['item'] is not base)
self.assertTrue(self.f.get('item') is not base)
self.assertTrue(self.getBase(self.f._getOb('item')) is base)

def testGenerateId(self):
ids = {}
Expand All @@ -201,7 +201,7 @@ def testReplace(self):
old_f._setObject(inner_f.id, inner_f)
self.ff._populateFromFolder(old_f)
self.assertEqual(self.ff.objectCount(), 1)
self.assert_('inner' in self.ff)
self.assertTrue('inner' in self.ff)
self.assertEqual(self.getBase(self.ff._getOb('inner')), inner_f)

def testObjectListing(self):
Expand All @@ -214,26 +214,26 @@ def testObjectListing(self):
self.assertEqual(info['b_end'], 2)
self.assertEqual(info['prev_batch_url'], '')
self.assertEqual(info['next_batch_url'], '')
self.assert_(info['formatted_list'].find('</select>') > 0)
self.assert_(info['formatted_list'].find('item') > 0)
self.assert_(info['formatted_list'].find('somefolder') > 0)
self.assertTrue(info['formatted_list'].find('</select>') > 0)
self.assertTrue(info['formatted_list'].find('item') > 0)
self.assertTrue(info['formatted_list'].find('somefolder') > 0)

# Ensure batching is working.
info = self.f.getBatchObjectListing({'b_count': 1})
self.assertEqual(info['b_start'], 1)
self.assertEqual(info['b_end'], 1)
self.assertEqual(info['prev_batch_url'], '')
self.assert_(info['next_batch_url'] != '')
self.assert_(info['formatted_list'].find('item') > 0)
self.assert_(info['formatted_list'].find('somefolder') < 0)
self.assertTrue(info['next_batch_url'] != '')
self.assertTrue(info['formatted_list'].find('item') > 0)
self.assertTrue(info['formatted_list'].find('somefolder') < 0)

info = self.f.getBatchObjectListing({'b_start': 2})
self.assertEqual(info['b_start'], 2)
self.assertEqual(info['b_end'], 2)
self.assert_(info['prev_batch_url'] != '')
self.assertTrue(info['prev_batch_url'] != '')
self.assertEqual(info['next_batch_url'], '')
self.assert_(info['formatted_list'].find('item') < 0)
self.assert_(info['formatted_list'].find('somefolder') > 0)
self.assertTrue(info['formatted_list'].find('item') < 0)
self.assertTrue(info['formatted_list'].find('somefolder') > 0)

def testObjectListingWithSpaces(self):
# The option list must use value attributes to preserve spaces.
Expand All @@ -243,24 +243,24 @@ def testObjectListingWithSpaces(self):
self.f.absolute_url = lambda: ''
info = self.f.getBatchObjectListing()
expect = '<option value="%s">%s</option>' % (name, name)
self.assert_(info['formatted_list'].find(expect) > 0)
self.assertTrue(info['formatted_list'].find(expect) > 0)

def testCleanup(self):
self.assert_(self.f._cleanup())
self.assertTrue(self.f._cleanup())
key = TrojanKey('a')
self.f._tree[key] = 'b'
self.assert_(self.f._cleanup())
self.assertTrue(self.f._cleanup())
key.value = 'z'

# With a key in the wrong place, there should now be damage.
self.assert_(not self.f._cleanup())
self.assertTrue(not self.f._cleanup())
# Now it's fixed.
self.assert_(self.f._cleanup())
self.assertTrue(self.f._cleanup())

from BTrees.OIBTree import OIBTree
tree = self.f._mt_index['d'] = OIBTree()
tree['e'] = 1
self.assert_(not self.f._cleanup())
self.assertTrue(not self.f._cleanup())

# Verify the management interface also works,
# but don't test return values.
Expand Down

0 comments on commit 0bb711d

Please sign in to comment.