Skip to content

Commit 9e12c2e

Browse files
Apply fixes suggested in jazzband#654
Signed-off-by: Aalekh Patel <aalekh@protectchildren.ca>
1 parent f25135c commit 9e12c2e

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

django_redis/cache.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,10 @@ def sdiffstore(self, *args, **kwargs):
204204
def sinter(self, *args, **kwargs):
205205
return self.client.sinter(*args, **kwargs)
206206

207+
@omit_exception
208+
def sintercard(self, *args, **kwargs):
209+
return self.client.sintercard(*args, **kwargs)
210+
207211
@omit_exception
208212
def sinterstore(self, *args, **kwargs):
209213
return self.client.sinterstore(*args, **kwargs)
@@ -212,6 +216,10 @@ def sinterstore(self, *args, **kwargs):
212216
def sismember(self, *args, **kwargs):
213217
return self.client.sismember(*args, **kwargs)
214218

219+
@omit_exception
220+
def smismember(self, *args, **kwargs):
221+
return self.client.smismember(*args, **kwargs)
222+
215223
@omit_exception
216224
def smembers(self, *args, **kwargs):
217225
return self.client.smembers(*args, **kwargs)
@@ -228,6 +236,10 @@ def spop(self, *args, **kwargs):
228236
def srandmember(self, *args, **kwargs):
229237
return self.client.srandmember(*args, **kwargs)
230238

239+
@omit_exception
240+
def sscan(self, *args, **kwargs):
241+
return self.client.sscan(*args, **kwargs)
242+
231243
@omit_exception
232244
def srem(self, *args, **kwargs):
233245
return self.client.srem(*args, **kwargs)

django_redis/client/default.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -818,16 +818,20 @@ def sdiff(
818818
def sdiffstore(
819819
self,
820820
dest: Any,
821+
key: Any,
821822
*keys,
822-
version: Optional[int] = None,
823+
versionDest: Optional[int] = None,
824+
versionMinuend: Optional[int] = None,
825+
versionSubtrahend: Optional[int] = None,
823826
client: Optional[Redis] = None,
824827
) -> int:
825828
if client is None:
826829
client = self.get_client(write=True)
827830

828-
dest = self.make_key(dest, version=version)
829-
keys = [self.make_key(key, version=version) for key in keys]
830-
return int(client.sdiffstore(dest, *keys))
831+
dest = self.make_key(dest, version=versionDest)
832+
minuend_key = self.make_key(key, version=versionMinuend)
833+
subtrahend_keys = [self.make_key(key_, version=versionSubtrahend) for key_ in keys]
834+
return int(client.sdiffstore(dest, minuend_key, *subtrahend_keys))
831835

832836

833837
def sinter(

0 commit comments

Comments
 (0)