Fix Python 3 TypeError: sequence item 0: expected str instance, bytes found on call to self.debuglog

.gitignore

@@ -3,3 +3,5 @@
 /python_memcached.egg-info
 .tox
 .coverage
+.idea
+lastfailed

.travis.yml

@@ -1,9 +1,9 @@
 language: python
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
+  - 3.6
   - pypy
 services:
   - memcached
@@ -12,3 +12,4 @@ before_script: pip install -r test-requirements.txt
 script:
   - flake8
   - nosetests
+  - python -c 'import memcache; memcache._doctest()'

ChangeLog

@@ -1,9 +1,9 @@
-   *  Added testing for Python 3.5 (PR from Tim Graham) #110
+   *  Added testing for Python 3.5 and 3.6 (PR from Tim Graham) #110, #131
 
    *  Fixed typos in docstrings (PR from Romuald Brunet, reviewed by Tim
       Graham) #105
 
-   *  Removing Python 2.6 and 3.2 testing (PR from Tim Graham) #115
+   *  Removing Python 2.6, 3.2, and 3.3 testing (PR from Tim Graham) #115, #116
 
    *  Removing unnecessary parens in return statements (PR from Tim Graham)
       #113

memcache.py

@@ -566,7 +566,7 @@ def _deletetouch(self, expected, cmd, key, time=0, noreply=False):
             if line and line.strip() in expected:
                 return 1
             self.debuglog('%s expected %s, got: %r'
-                          % (cmd, ' or '.join(expected), line))
+                          % (cmd, b' or '.join(expected), line))
         except socket.error as msg:
             if isinstance(msg, tuple):
                 msg = msg[1]
@@ -834,9 +834,9 @@ def set_multi(self, mapping, time=0, key_prefix='', min_compress_len=0,
         '''Sets multiple keys in the memcache doing just one query.
 
         >>> notset_keys = mc.set_multi({'key1' : 'val1', 'key2' : 'val2'})
-        >>> mc.get_multi(['key1', 'key2']) == {'key1' : 'val1',
-        ...                                    'key2' : 'val2'}
-        1
+        >>> keys = mc.get_multi(['key1', 'key2'])
+        >>> keys == {'key1': 'val1', 'key2': 'val2'}
+        True
 
 
         This method is recommended over regular L{set} as it lowers
@@ -856,14 +856,13 @@ def set_multi(self, mapping, time=0, key_prefix='', min_compress_len=0,
             sending to memcache. Allows you to efficiently stuff these
             keys into a pseudo-namespace in memcache:
 
-            >> notset_keys = mc.set_multi(
+            >>> notset_keys = mc.set_multi(
             ...     {'key1' : 'val1', 'key2' : 'val2'},
             ...     key_prefix='subspace_')
             >>> len(notset_keys) == 0
             True
-            >>> mc.get_multi(['subspace_key1',
-            ...               'subspace_key2']) == {'subspace_key1': 'val1',
-            ...                                     'subspace_key2' : 'val2'}
+            >>> keys = mc.get_multi(['subspace_key1', 'subspace_key2'])
+            >>> keys == {'subspace_key1': 'val1', 'subspace_key2': 'val2'}
             True
 
             Causes key 'subspace_key1' and 'subspace_key2' to be
@@ -1141,7 +1140,7 @@ def get_multi(self, keys, key_prefix=''):
         ...              key_prefix='pfx_') == {'k1' : 1, 'k2' : 2}
         1
 
-        get_mult [ and L{set_multi} ] can take str()-ables like ints /
+        get_multi [ and L{set_multi} ] can take str()-ables like ints /
         longs as keys too. Such as your db pri key fields.  They're
         rotored through str() before being passed off to memcache,
         with or without the use of a key_prefix.  In this mode, the

setup.py

@@ -28,7 +28,7 @@
           "Programming Language :: Python :: 2",
           "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
-          "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
           ])

test-requirements.txt

@@ -1,3 +1,4 @@
 nose
 coverage
 hacking
+mock

tests/test_memcache.py

@@ -1,10 +1,10 @@
 from __future__ import print_function
 
-import unittest
-
+import mock
 import six
+import unittest
 
-from memcache import Client, SERVER_MAX_KEY_LENGTH, SERVER_MAX_VALUE_LENGTH  # noqa: H301
+from memcache import Client, _Host, SERVER_MAX_KEY_LENGTH, SERVER_MAX_VALUE_LENGTH  # noqa: H301
 
 
 class FooStruct(object):
@@ -166,6 +166,13 @@ def test_disconnect_all_delete_multi(self):
         ret = self.mc.delete_multi({'keyhere': 'a', 'keythere': 'b'})
         self.assertEqual(ret, 1)
 
+    @mock.patch.object(_Host, 'readline')
+    def test_memcached_error_unexpected_reply(self, mock_readline):
+        """Test that the debug log executes properly in error response."""
+        mock_readline.return_value = 'SET'
+        cache_key = ':cache:key:1'
+        self.mc.touch(cache_key)
+
 
 if __name__ == '__main__':
     unittest.main()

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py27,py33,py34,py35,pypy,pep8
+envlist = py27,py34,py35,p36,pypy,pep8
 skipsdist = True
 
 [testenv]