Changing check_key to check_keys.release-1.49

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3715b82..a41deff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-   *  Client() now takes a "check_key" option, which defaults to True.
+Mon, 06 May 2013 07:20:21 -0600  Sean Reifschneider  <jafo@tummy.com>
+
+   *  1.49 release.
+
+   *  Client() now takes a "check_keys" option, which defaults to True.
       If False, it disables the checking of keys to ensure they have
       acceptable size and are composed of non-control characters.
       Suggested by Ben Hoyt.
diff --git a/memcache.py b/memcache.py
index 4865b90..c4deb98 100644
--- a/memcache.py
+++ b/memcache.py
@@ -163,7 +163,7 @@ class Client(local):
                  server_max_key_length=SERVER_MAX_KEY_LENGTH,
                  server_max_value_length=SERVER_MAX_VALUE_LENGTH,
                  dead_retry=_DEAD_RETRY, socket_timeout=_SOCKET_TIMEOUT,
-                 cache_cas = False, flush_on_reconnect=0, check_key=True):
+                 cache_cas = False, flush_on_reconnect=0, check_keys=True):
         """
         Create a new Client object with the given list of servers.
 
@@ -196,7 +196,7 @@ class Client(local):
         back, those keys will map to it again. If it still has its data, get()s
         can read stale data that was overwritten on another server. This flag
         is off by default for backwards compatibility.
-        @param check_key: (default True) If True, the key is checked to
+        @param check_keys: (default True) If True, the key is checked to
         ensure it is the correct length and composed of the right characters.
         """
         local.__init__(self)
@@ -208,7 +208,7 @@ class Client(local):
         self.stats = {}
         self.cache_cas = cache_cas
         self.reset_cas()
-        self.do_check_key = check_key
+        self.do_check_key = check_keys
 
         # Allow users to modify pickling/unpickling behavior
         self.pickleProtocol = pickleProtocol