From 93e06f29787fce6f7c58acd9d1e17a7192a66c94 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Tue, 31 Aug 2021 10:37:59 +0200
Subject: [PATCH] Refs #33061 -- Removed unnecessary BaseMemcachedCache.decr().
---
django/core/cache/backends/memcached.py | 30 ++++++-------------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 0ca485903a..62480cfe7c 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -105,33 +105,17 @@ class BaseMemcachedCache(BaseCache):
self._cache.disconnect_all()
def incr(self, key, delta=1, version=None):
- # memcached doesn't support a negative delta
- if delta < 0:
- return self.decr(key, -delta, version=version)
key = self.make_key(key, version=version)
self.validate_key(key)
try:
- val = self._cache.incr(key, delta)
-
+ # Memcached doesn't support negative delta.
+ if delta < 0:
+ val = self._cache.decr(key, -delta)
+ else:
+ val = self._cache.incr(key, delta)
# Normalize an exception raised by the underlying client library to
- # ValueError in the event of a nonexistent key when calling incr().
- except self.LibraryValueNotFoundException:
- val = None
- if val is None:
- raise ValueError("Key '%s' not found" % key)
- return val
-
- def decr(self, key, delta=1, version=None):
- # memcached doesn't support a negative delta
- if delta < 0:
- return self.incr(key, -delta, version=version)
- key = self.make_key(key, version=version)
- self.validate_key(key)
- try:
- val = self._cache.decr(key, delta)
-
- # Normalize an exception raised by the underlying client library to
- # ValueError in the event of a nonexistent key when calling decr().
+ # ValueError in the event of a nonexistent key when calling
+ # incr()/decr().
except self.LibraryValueNotFoundException:
val = None
if val is None: