From a1bf081754cd38de1a20925782a5404de00bd46d Mon Sep 17 00:00:00 2001
From: Nicholas Charriere <nicholas@pinterest.com>
Date: Mon, 3 Oct 2016 11:31:17 -0700
Subject: Fix #117, illegal unicode character in middle of key (or value now)

Add .python-version to .gitignore (for pyenv)
---
 .gitignore                     |  1 +
 pymemcache/client/base.py      |  4 ++--
 pymemcache/test/test_client.py |  9 +++++++++
 pymemcache/test/utils.py       | 15 +++++++++++++++
 tox.ini                        |  5 +++--
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50ddd1c..6162695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ env/
 .pip
 .pypirc
 coverage.xml
+.python-version
 \#*\#
 docs/_build
 docs/apidoc/pymemcache.test.rst
diff --git a/pymemcache/client/base.py b/pymemcache/client/base.py
index fc23ccb..76bda96 100644
--- a/pymemcache/client/base.py
+++ b/pymemcache/client/base.py
@@ -82,10 +82,10 @@ STAT_TYPES = {
 
 def _check_key(key, key_prefix=b''):
     """Checks key and add key_prefix."""
-    if isinstance(key, six.text_type):
+    if isinstance(key, six.text_type) or isinstance(key, six.string_types):
         try:
             key = key.encode('ascii')
-        except UnicodeEncodeError:
+        except (UnicodeEncodeError, UnicodeDecodeError):
             raise MemcacheIllegalInputError("Non-ASCII key: '%r'" % (key,))
     key = key_prefix + key
     if b' ' in key or b'\n' in key:
diff --git a/pymemcache/test/test_client.py b/pymemcache/test/test_client.py
index 530f4c1..6d658f5 100644
--- a/pymemcache/test/test_client.py
+++ b/pymemcache/test/test_client.py
@@ -92,6 +92,15 @@ class ClientTestMixin(object):
         with pytest.raises(MemcacheIllegalInputError):
             _set()
 
+    def test_set_unicode_char_in_middle_of_key(self):
+        client = self.make_client([b'STORED\r\n'])
+
+        def _set():
+            client.set('helloworld_\xb1901520_%c3', b'value', noreply=False)
+
+        with pytest.raises(MemcacheIllegalInputError):
+            _set()
+
     def test_set_unicode_value(self):
         client = self.make_client([b''])
 
diff --git a/pymemcache/test/utils.py b/pymemcache/test/utils.py
index f2c5a80..4414031 100644
--- a/pymemcache/test/utils.py
+++ b/pymemcache/test/utils.py
@@ -43,6 +43,11 @@ class MockMemcacheClient(object):
     def get(self, key, default=None):
         if isinstance(key, six.text_type):
             raise MemcacheIllegalInputError(key)
+        if isinstance(key, six.string_types):
+            try:
+                key = key.encode('ascii')
+            except (UnicodeEncodeError, UnicodeDecodeError):
+                raise MemcacheIllegalInputError
 
         if key not in self._contents:
             return default
@@ -71,6 +76,16 @@ class MockMemcacheClient(object):
             raise MemcacheIllegalInputError(key)
         if isinstance(value, six.text_type):
             raise MemcacheIllegalInputError(value)
+        if isinstance(key, six.string_types):
+            try:
+                key = key.encode('ascii')
+            except (UnicodeEncodeError, UnicodeDecodeError):
+                raise MemcacheIllegalInputError
+        if isinstance(value, six.string_types):
+            try:
+                value = value.encode('ascii')
+            except (UnicodeEncodeError, UnicodeDecodeError):
+                raise MemcacheIllegalInputError
 
         flags = 0
         if self.serializer:
diff --git a/tox.ini b/tox.ini
index 5b067dc..9ddd35c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py26, py27, pypy, pypy3, py33, py34, docs, py27-flake8, py34-flake8
+envlist = py26, py27, pypy, pypy3, py33, py34, py35, docs, py27-flake8, py35-flake8
+skip_missing_interpreters = True
 
 [testenv]
 commands =
@@ -12,7 +13,7 @@ commands =
     pip install flake8
     flake8 pymemcache/
 
-[testenv:py34-flake8]
+[testenv:py35-flake8]
 commands =
     pip install flake8
     flake8 pymemcache/
-- 
cgit v1.2.1