test: decouple bytes and strings

Part of #82

Author: ligurio

test/binary/binary-boundary.test.py

@@ -19,7 +19,7 @@ def iequal(left, right, level = 1):
         tb = traceback.extract_stack()[-(level + 1)]
         print("Error on line %s:%d: %s not equal %s" % (tb[0], tb[1],
                 repr(left), repr(right)))
-        if (isinstance(left, basestring)):
+        if (isinstance(left, string_types)):
             if (len(left) != len(right)):
                 print("length is different")
         return False
@@ -41,7 +41,7 @@ def check(key, flags, val, level = 0):
     val  = "x" * i
     mc.setq(key, val, flags=82, nosend=True)
     mc.setq("alt_%s" % key, "blah", flags=82, nosend=True)
-    data = "".join(mc.commands)
+    data = b"".join(mc.commands)
     mc.commands = []
 
     if (len(data) > 2024):

test/binary/binary-expire.test.py

@@ -41,15 +41,15 @@ def check(key, flags, val, level = 0):
 
 stat = mc.stat("reset")
 
-for i in xrange(10000):
+for i in range(10000):
     mc.set('key-%d' % i, 'value-%d' % i, expire=1)
 
 stat = mc.stat()
-while int(stat.get('evictions', '0')) < 10000:
+while int(stat.get(b'evictions', '0')) < 10000:
     time.sleep(0.01)
     stat = mc.stat()
 
-issert('evictions' in stat)
-iequal(int(mc.stat().get('evictions', 0)), 10000)
+issert(b'evictions' in stat)
+iequal(int(mc.stat().get(b'evictions', 0)), 10000)
 
 sys.path = saved_path

test/binary/binary-gh-73.test.py

@@ -18,7 +18,7 @@
     key = "test_key_%d" % i
     mc.setq(key, val, flags = 82, nosend=True)
 
-data = "".join(mc.commands)
+data = b"".join(mc.commands)
 mc.socket.sendall(data)
 
 # Get any key right after setting.

test/binary/binary.test.py

@@ -251,7 +251,7 @@ def check_empty_response(con):
 empty("y")
 
 stat2 = mc.stat()
-iequal(int(stat1['cmd_flush']) + 1, int(stat2['cmd_flush']))
+iequal(int(stat1[b'cmd_flush']) + 1, int(stat2[b'cmd_flush']))
 
 print("""#----------------------------# diagnostics append #---------------------------#""")
 key, value, suffix = "appendkey", "some value", " more"

test/capable/capable-binary.test.py

@@ -12,6 +12,8 @@
 from internal.memcached_connection import MemcachedBinaryConnection
 from internal.memcached_connection import STATUS, COMMANDS
 
+from internal.compat import bytes_to_str
+
 mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
 mc.flush()
 
@@ -21,6 +23,6 @@
 task = Popen(cmd, stdout=PIPE, stderr=STDOUT)
 
 testcase = task.communicate()[0]
-print(testcase)
+print(bytes_to_str(testcase))
 
 sys.path = saved_path

test/capable/capable-text.test.py

@@ -12,6 +12,8 @@
 from internal.memcached_connection import MemcachedBinaryConnection
 from internal.memcached_connection import STATUS, COMMANDS
 
+from internal.compat import bytes_to_str
+
 mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
 mc.flush()
 
@@ -21,6 +23,6 @@
 task = Popen(cmd, stdout=PIPE, stderr=STDOUT)
 
 testcase = task.communicate()[0]
-print(testcase)
+print(bytes_to_str(testcase))
 
 sys.path = saved_path

test/internal/compat.py

@@ -0,0 +1,48 @@
+import sys
+
+# Added for compatibility with Python 3.
+
+# Useful for very coarse version differentiation.
+PY3 = sys.version_info[0] == 3
+PY2 = sys.version_info[0] == 2
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+else:
+    string_types = basestring,      # noqa: F821
+    integer_types = (int, long)     # noqa: F821
+
+def assert_bytes(b):
+    """ Ensure given value is <bytes>.
+    """
+    if type(b) != bytes:
+        raise ValueError('Internal error: expected {}, got {}: {}'.format(
+            str(bytes), str(type(b)), repr(b)))
+
+def assert_str(s):
+    """ Ensure given value is <str>.
+    """
+    if type(s) != str:
+        raise ValueError('Internal error: expected {}, got {}: {}'.format(
+            str(str), str(type(s)), repr(s)))
+
+def bytes_to_str(b):
+    """ Convert <bytes> to <str>.
+
+        No-op on Python 2.
+    """
+    assert_bytes(b)
+    if PY2:
+        return b
+    return b.decode('utf-8')
+
+def str_to_bytes(s):
+    """ Convert <str> to <bytes>.
+
+        No-op on Python 2.
+    """
+    assert_str(s)
+    if PY2:
+        return s
+    return s.encode('utf-8')

test/internal/memcached_connection.py

@@ -4,6 +4,7 @@
 from struct import Struct
 
 from lib.tarantool_connection import TarantoolConnection
+from internal.compat import bytes_to_str, str_to_bytes
 
 HEADER        = '!BBHBBHLLQ'
 HEADER_STRUCT = Struct(HEADER)
@@ -165,7 +166,7 @@ def __init__(self, host, port):
         self.connect()
 
     def send(self):
-        commands = ''.join(self.commands)
+        commands = b''.join(self.commands)
         self.socket.sendall(commands)
         self.commands = []
 
@@ -238,7 +239,10 @@ def _read_and_parse_response(self):
             if is_indecrq(op):
                 val = INDECR_STRUCT.unpack_from(val)[0]
         if val is not None:
-            retval['val'] = val
+            if isinstance(val, bytes):
+                retval['val'] = bytes_to_str(val)
+            else:
+                retval['val'] = val
 
         return retval
 
@@ -268,9 +272,9 @@ def append_query(self, cmd, args):
         retval = [
             struct.pack(MAGIC['request'], op, key_len, ext_len, dtype, 0,
                         tot_len, opaque, cas, *extra),
-            key, val
+            str_to_bytes(key), str_to_bytes(val)
         ]
-        cmd = ''.join(retval)
+        cmd = b''.join(retval)
         self.commands.append(cmd)
 
     @binary_decorator
@@ -559,7 +563,7 @@ def execute_no_reconnect(self, commands, silent = False):
 
     def send(self, commands, silent = False):
         self.commands = commands
-        self.socket.sendall(commands)
+        self.socket.sendall(str_to_bytes(commands))
         if not silent:
             print("<<" + '-' * 50)
             sys.stdout.write(self.commands.strip() + '\n')
@@ -699,7 +703,7 @@ def read_line(self):
             index = buf.find(MEMCACHED_SEPARATOR)
             if index > 0:
                 break
-            data = self.socket.recv(1048576)
+            data = bytes_to_str(self.socket.recv(1048576))
             if not data:
                 return None
             buf += data