summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorEd Morley <emorley@mozilla.com>2016-08-31 18:15:22 +0100
committerTim Graham <timograham@gmail.com>2016-08-31 17:23:41 -0400
commitd8ef5b0e6501692b8b767ebccddc936f496d77e8 (patch)
tree9bc2aaa5e9acdf63d401e617727953570d7322dd /django
parentc8058dc241e7eea49ea6cf0e0abe7c4c38b79783 (diff)
Fixed #27152 -- Supported comma delimiter in memcached LOCATION string.
Diffstat (limited to 'django')
-rw-r--r--django/core/cache/backends/memcached.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 2ca9f663d7..19671b4872 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -1,6 +1,7 @@
"Memcached cache backend"
import pickle
+import re
import time
import warnings
@@ -15,7 +16,7 @@ class BaseMemcachedCache(BaseCache):
def __init__(self, server, params, library, value_not_found_exception):
super(BaseMemcachedCache, self).__init__(params)
if isinstance(server, six.string_types):
- self._servers = server.split(';')
+ self._servers = re.split('[;,]', server)
else:
self._servers = server