Merge pull request #3 from tarantool/master

master rebase

Author: shveenkov

doc/quick-start.ru.rst

@@ -34,7 +34,7 @@ Select
 
     >>> demo.select('AAAA')
 
-Извлечь несколько записей используя перыичный индекс::
+Извлечь несколько записей используя первичный индекс::
 
     >>> demo.select(['AAAA', 'BBBB', 'CCCC'])
     [('AAAA', 'Alpha'), ('BBBB', 'Bravo'), ('CCCC', 'Charlie')]

requirements.txt

@@ -1,2 +1,3 @@
 msgpack-python>=0.4.0
 pyyaml>=3.10
+six

setup.py

@@ -83,5 +83,7 @@ def find_version(*file_paths):
     command_options=command_options,
     install_requires=[
         'msgpack-python>=0.4',
+        'six',
+        'PyYAML>=3.10',
     ]
 )

tarantool/connection.py

@@ -4,6 +4,7 @@
 This module provides low-level API for Tarantool
 '''
 
+import six
 import time
 import errno
 import ctypes
@@ -62,11 +63,6 @@ class Connection(object):
     Also this class provides low-level interface to data manipulation
     (insert/delete/update/select).
     '''
-    _libc = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True)
-    _sys_recv = ctypes.CFUNCTYPE(c_ssize_t, ctypes.c_int, ctypes.c_void_p,
-                                 c_ssize_t, ctypes.c_int,
-                                 use_errno=True)(_libc.recv)
-
     Error = tarantool.error
     DatabaseError = tarantool.error.DatabaseError
     InterfaceError = tarantool.error.InterfaceError
@@ -89,6 +85,11 @@ def __init__(self, host, port,
         creates network connection.
                              if False than you have to call connect() manualy.
         '''
+        libc = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True)
+        recv = self._sys_recv = libc.recv
+        recv.argtypes = [
+            ctypes.c_int, ctypes.c_void_p, c_ssize_t, ctypes.c_int]
+        recv.restype = c_ssize_t
         self.host = host
         self.port = port
         self.user = user
@@ -154,7 +155,7 @@ def connect(self):
             raise NetworkError(e)
 
     def _recv(self, to_read):
-        buf = ''
+        buf = b""
         while to_read > 0:
             try:
                 tmp = self._socket.recv(to_read)
@@ -188,7 +189,7 @@ def _send_request_wo_reconnect(self, request):
 
         # Repeat request in a loop if the server returns completion_status == 1
         # (try again)
-        for attempt in xrange(RETRY_MAX_ATTEMPTS):    # pylint: disable=W0612
+        for attempt in range(RETRY_MAX_ATTEMPTS):    # pylint: disable=W0612
             self._socket.sendall(bytes(request))
             response = Response(self, self._read_response())
 
@@ -328,7 +329,7 @@ def replace(self, space_name, values):
 
         :rtype: `Response` instance
         '''
-        if isinstance(space_name, basestring):
+        if isinstance(space_name, six.string_types):
             space_name = self.schema.get_space(space_name).sid
         request = RequestReplace(self, space_name, values)
         return self._send_request(request)
@@ -377,7 +378,7 @@ def insert(self, space_name, values):
 
         :rtype: `Response` instance
         '''
-        if isinstance(space_name, basestring):
+        if isinstance(space_name, six.string_types):
             space_name = self.schema.get_space(space_name).sid
         request = RequestInsert(self, space_name, values)
         return self._send_request(request)
@@ -397,9 +398,9 @@ def delete(self, space_name, key, **kwargs):
         index_name = kwargs.get("index", 0)
 
         key = check_key(key)
-        if isinstance(space_name, basestring):
+        if isinstance(space_name, six.string_types):
             space_name = self.schema.get_space(space_name).sid
-        if isinstance(index_name, basestring):
+        if isinstance(index_name, six.string_types):
             index_name = self.schema.get_index(space_name, index_name).iid
         request = RequestDelete(self, space_name, index_name, key)
         return self._send_request(request)
@@ -427,9 +428,9 @@ def update(self, space_name, key, op_list, **kwargs):
         index_name = kwargs.get("index", 0)
 
         key = check_key(key)
-        if isinstance(space_name, basestring):
+        if isinstance(space_name, six.string_types):
             space_name = self.schema.get_space(space_name).sid
-        if isinstance(index_name, basestring):
+        if isinstance(index_name, six.string_types):
             index_name = self.schema.get_index(space_name, index_name).iid
         request = RequestUpdate(self, space_name, index_name, key, op_list)
         return self._send_request(request)
@@ -503,9 +504,9 @@ def select(self, space_name, key=None, **kwargs):
         # tuples)
         key = check_key(key, select=True)
 
-        if isinstance(space_name, basestring):
+        if isinstance(space_name, six.string_types):
             space_name = self.schema.get_space(space_name).sid
-        if isinstance(index_name, basestring):
+        if isinstance(index_name, six.string_types):
             index_name = self.schema.get_index(space_name, index_name).iid
         request = RequestSelect(self, space_name, index_name, key, offset,
                                 limit, iterator_type)

tarantool/error.py

@@ -24,10 +24,12 @@
 import sys
 import warnings
 
-
-class Error(StandardError):
-
-    '''Base class for error exceptions'''
+try:
+    class Error(StandardError):
+        '''Base class for error exceptions'''
+except NameError:
+    class Error(Exception):
+        '''Base class for error exceptions'''
 
 
 class DatabaseError(Error):

tarantool/request.py

@@ -4,6 +4,7 @@
 Request types definitions
 '''
 
+import six
 import msgpack
 import hashlib
 
@@ -105,14 +106,18 @@ def __init__(self, conn, salt, user, password):
         super(RequestAuthenticate, self).__init__(conn)
 
         def sha1(values):
-            sha1 = hashlib.sha1()
+            sha = hashlib.sha1()
             for i in values:
-                sha1.update(i)
-            return sha1.digest()
+                if i is not None:
+                    sha.update(i if isinstance(i, six.binary_type) else i.encode())
+            return sha.digest()
 
         def strxor(rhs, lhs):
+            if six.PY2:
                 return "".join(chr(ord(x) ^ ord(y)) for x, y in zip(rhs, lhs))
 
+            return bytes([x ^ y for x, y in zip(rhs, lhs)])
+
         hash1 = sha1((password,))
         hash2 = sha1((hash1,))
         scramble = sha1((salt, hash2))

tarantool/response.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=C0301,W0105,W0401,W0614
 
+import six
 import sys
 import msgpack
 import yaml
@@ -41,7 +42,11 @@ def __init__(self, conn, response):
         # created in the __new__(). But let it be.
         super(Response, self).__init__()
 
-        unpacker = msgpack.Unpacker(use_list=True)
+        if six.PY2:
+            unpacker = msgpack.Unpacker(use_list=True)
+        else:
+            unpacker = msgpack.Unpacker(use_list=True, encoding="utf-8")
+
         unpacker.feed(response)
         header = unpacker.unpack()
 

tarantool/schema.py

@@ -5,6 +5,8 @@
 It is a Tarantool schema description.
 '''
 
+import six
+
 from tarantool.error import SchemaError
 import tarantool.const as const
 
@@ -16,7 +18,7 @@ def __init__(self, array, space):
         self.index = array[3]
         self.unique = array[4]
         self.parts = []
-        for i in xrange(array[5]):
+        for i in range(array[5]):
             self.parts.append((array[5 + 1 + i * 2], array[5 + 2 + i * 2]))
         self.space = space
         self.space.indexes[self.iid] = self
@@ -57,14 +59,14 @@ def get_space(self, space):
         except KeyError:
             pass
         _index = (const.INDEX_SPACE_NAME
-                  if isinstance(space, basestring)
+                  if isinstance(space, six.string_types)
                   else const.INDEX_SPACE_PRIMARY)
 
         array = self.con.select(const.SPACE_SPACE, space, index=_index)
         if len(array) > 1:
             raise SchemaError('Some strange output from server: \n' + array)
         elif len(array) == 0 or not len(array[0]):
-            temp_name = ('name' if isinstance(space, basestring) else 'id')
+            temp_name = ('name' if isinstance(space, six.string_types) else 'id')
             raise SchemaError(
                 "There's no space with {1} '{0}'".format(space, temp_name))
         array = array[0]
@@ -77,15 +79,15 @@ def get_index(self, space, index):
         except KeyError:
             pass
         _index = (const.INDEX_INDEX_NAME
-                  if isinstance(index, basestring)
+                  if isinstance(index, six.string_types)
                   else const.INDEX_INDEX_PRIMARY)
 
         array = self.con.select(const.SPACE_INDEX, [_space.sid, index],
                                 index=_index)
         if len(array) > 1:
             raise SchemaError('Some strange output from server: \n' + array)
         elif len(array) == 0 or not len(array[0]):
-            temp_name = ('name' if isinstance(index, basestring) else 'id')
+            temp_name = ('name' if isinstance(index, six.string_types) else 'id')
             raise SchemaError(
                 "There's no index with {2} '{0}' in space '{1}'".format(
                     index, _space.name, temp_name))

tarantool/utils.py

@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+
+import six
+
 def check_key(*args, **kwargs):
     if 'first' not in kwargs:
         kwargs['first'] = True
@@ -12,5 +16,5 @@ def check_key(*args, **kwargs):
         elif args[0] is None and kwargs['select']:
             return []
     for key in args:
-        assert isinstance(key, (int, long, basestring))
+        assert isinstance(key, six.integer_types + six.string_types)
     return list(args)

tests/suites/lib/tarantool_server.py

@@ -1,4 +1,7 @@
+# -*- coding: utf-8 -*-
+
 import os
+import os.path
 import errno
 import shlex
 import random
@@ -39,6 +42,7 @@ def __init__(self, host, port):
         self.port = port
         self.is_connected = False
         self.socket = None
+
     def connect(self):
         self.socket = socket.create_connection((self.host, self.port))
         self.socket.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
@@ -87,7 +91,7 @@ def execute_no_reconnect(self, command):
         if not command:
             return
         cmd = command.replace('\n', ' ') + '\n'
-        self.socket.sendall(cmd)
+        self.socket.sendall(cmd.encode())
 
         bufsiz = 4096
         res = ""
@@ -96,7 +100,7 @@ def execute_no_reconnect(self, command):
             buf = self.socket.recv(bufsiz)
             if not buf:
                 break
-            res = res + buf
+            res = res + buf.decode()
             if (res.rfind("\n...\n") >= 0 or res.rfind("\r\n...\r\n") >= 0):
                 break
 
@@ -134,6 +138,7 @@ def script_dst(self):
     def script(self):
         if not hasattr(self, '_script'): self._script = None
         return self._script
+
     @script.setter
     def script(self, val):
         if val is None:
@@ -153,6 +158,7 @@ def _admin(self):
         if not hasattr(self, 'admin'):
             self.admin = None
         return self.admin
+
     @_admin.setter
     def _admin(self, port):
         try:
@@ -168,6 +174,7 @@ def log_des(self):
         if not hasattr(self, '_log_des'):
             self._log_des = open(self.logfile_path, 'a')
         return self._log_des
+
     @log_des.deleter
     def log_des(self):
         if not hasattr(self, '_log_des'):
@@ -193,7 +200,7 @@ def find_exe(self):
             exe = os.path.join(_dir, self.default_tarantool["bin"])
             if os.access(exe, os.X_OK):
                 return os.path.abspath(exe)
-        raise RuntimeError("Can't find server executable in " + path)
+        raise RuntimeError("Can't find server executable in " + os.environ["PATH"])
 
     def generate_configuration(self):
         os.putenv("PRIMARY_PORT", str(self.args['primary']))
@@ -240,7 +247,7 @@ def start(self):
         self.generate_configuration()
         if self.script:
             shutil.copy(self.script, self.script_dst)
-            os.chmod(self.script_dst, 0777)
+            os.chmod(self.script_dst, 0o777)
         args = self.prepare_args()
         self.process = subprocess.Popen(args,
                 cwd = self.vardir,
@@ -249,15 +256,17 @@ def start(self):
         self.wait_until_started()
 
     def stop(self):
-        self.process.terminate()
-        self.process.wait()
+        if self.process.poll() is None:
+            self.process.terminate()
+            self.process.wait()
 
     def restart(self):
         self.stop()
         self.start()
 
     def clean(self):
-        shutil.rmtree(self.vardir)
+        if os.path.isdir(self.vardir):
+            shutil.rmtree(self.vardir)
 
     def __del__(self):
         self.stop()