diff options
| author | Sean Reifschneider <jafo@tummy.com> | 2013-08-12 22:32:05 -0600 |
|---|---|---|
| committer | Sean Reifschneider <jafo@tummy.com> | 2013-08-12 22:32:05 -0600 |
| commit | 7afab362d039846a56b03db8236fdeaf230da42a (patch) | |
| tree | 0a056bc8b043f598245eabd1ef581a20eedaf162 | |
| parent | 028cd753ad9aaf372a8f285ff9b9230898a38298 (diff) | |
| download | python-memcached-7afab362d039846a56b03db8236fdeaf230da42a.tar.gz | |
Alowing SERVER_MAX* to be set after import.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | memcache.py | 9 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,6 @@ + * Setting the SERVER_MAX_* values after import did not work, despite + being documented to. Reported by alexf101 on github. + Sun, 07 Jun 2013 11:12:18 -0600 Sean Reifschneider <jafo@tummy.com> * 1.53 release. diff --git a/memcache.py b/memcache.py index 9e511bd..cd300f1 100644 --- a/memcache.py +++ b/memcache.py @@ -77,7 +77,7 @@ try: except ImportError: from StringIO import StringIO -valid_key_chars_re = re.compile('[\x21-\x7e\x80-\xff]+$') +valid_key_chars_re = re.compile('[\x21-\x7e\xa0-\xff]+$') # Original author: Evan Martin of Danga Interactive @@ -160,8 +160,7 @@ class Client(local): def __init__(self, servers, debug=0, pickleProtocol=0, pickler=pickle.Pickler, unpickler=pickle.Unpickler, pload=None, pid=None, - server_max_key_length=SERVER_MAX_KEY_LENGTH, - server_max_value_length=SERVER_MAX_VALUE_LENGTH, + server_max_key_length=None, server_max_value_length=None, dead_retry=_DEAD_RETRY, socket_timeout=_SOCKET_TIMEOUT, cache_cas = False, flush_on_reconnect=0, check_keys=True): """ @@ -217,7 +216,11 @@ class Client(local): self.persistent_load = pload self.persistent_id = pid self.server_max_key_length = server_max_key_length + if self.server_max_key_length is None: + self.server_max_key_length = SERVER_MAX_KEY_LENGTH self.server_max_value_length = server_max_value_length + if self.server_max_value_length is None: + self.server_max_value_length = SERVER_MAX_VALUE_LENGTH # figure out the pickler style file = StringIO() |