summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Chainz <adam@adamj.eu>2016-08-16 18:08:47 +0100
committerAdam Chainz <adam@adamj.eu>2016-08-16 18:08:47 +0100
commit8c5d87d386c851e4cb0dd91156691284e67a9d05 (patch)
tree340cd4f831ef92292ff4158e37be7dd5b7f203e9
parentb180ebc5de10c0633ce8bf9b68ec4d0889097c8c (diff)
downloadpymemcache-8c5d87d386c851e4cb0dd91156691284e67a9d05.tar.gz
Improve MemcacheIllegalInputError messages
* Quote the key so it's easier to realize e.g. trailing spaces * Point out newlines are bad as well as spaces * Capitalize ASCII
-rw-r--r--pymemcache/client/base.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/pymemcache/client/base.py b/pymemcache/client/base.py
index 2d48abf..f572e68 100644
--- a/pymemcache/client/base.py
+++ b/pymemcache/client/base.py
@@ -70,12 +70,14 @@ def _check_key(key, key_prefix=b''):
try:
key = key.encode('ascii')
except UnicodeEncodeError:
- raise MemcacheIllegalInputError("No ascii key: %r" % (key,))
+ raise MemcacheIllegalInputError("Non-ASCII key: '%r'" % (key,))
key = key_prefix + key
if b' ' in key or b'\n' in key:
- raise MemcacheIllegalInputError("Key contains spaces: %r" % (key,))
+ raise MemcacheIllegalInputError(
+ "Key contains space and/or newline: '%r'" % (key,)
+ )
if len(key) > 250:
- raise MemcacheIllegalInputError("Key is too long: %r" % (key,))
+ raise MemcacheIllegalInputError("Key is too long: '%r'" % (key,))
return key