Skip to content

Commit

Permalink
multi_get and multi_delete do not take var-args.
Browse files Browse the repository at this point in the history
  • Loading branch information
coleifer committed May 4, 2018
1 parent d1605b0 commit 56da155
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions sophy.pyx
Expand Up @@ -780,7 +780,7 @@ cdef class Database(object):
check_open(self.env)
return self._delete((key,) if not isinstance(key, tuple) else key)

def multi_delete(self, *keys):
def multi_delete(self, keys):
check_open(self.env)
for key in keys:
self._delete((key,) if not isinstance(key, tuple) else key)
Expand Down Expand Up @@ -827,7 +827,7 @@ cdef class Database(object):

multi_set = update

def multi_get(self, *keys):
def multi_get(self, keys):
cdef list accum = []
for key in keys:
try:
Expand Down
6 changes: 3 additions & 3 deletions tests.py
Expand Up @@ -60,7 +60,7 @@ def test_crud(self):
db['huey'] = 'kitten'
self.assertEqual(db['huey'], 'kitten')
db.delete('huey')
self.assertEqual(db.multi_get('huey'), [None])
self.assertEqual(db.multi_get(['huey']), [None])

db.set('k1', 'v1')
db.set('k2', 'v2')
Expand Down Expand Up @@ -91,7 +91,7 @@ def test_multi_get_set(self):
for i in range(4):
db['k%s' % i] = 'v%s' % i

self.assertEqual(db.multi_get('k0', 'k3', 'k99'), ['v0', 'v3', None])
self.assertEqual(db.multi_get(['k0', 'k3', 'k99']), ['v0', 'v3', None])
self.assertEqual(db.multi_get_dict(['k0', 'k3', 'k99']),
{'k0': 'v0', 'k3': 'v3'})

Expand Down Expand Up @@ -366,7 +366,7 @@ def test_update_multiget(self):
events = ((2017, 1, 1, 'holiday'),
(2017, 12, 25, 'holiday'),
(2017, 7, 1, 'birthday'))
self.assertEqual(self.db.multi_get(*events), [
self.assertEqual(self.db.multi_get(events), [
('us', 'new years'),
('us', 'christmas'),
('private', 'huey')])
Expand Down

0 comments on commit 56da155

Please sign in to comment.