remove six as dependency + pylint

closes gh-89

Author: bigbes

requirements.txt

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

setup.py

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

tarantool/__init__.py

@@ -6,7 +6,6 @@
     SOCKET_TIMEOUT,
     RECONNECT_MAX_ATTEMPTS,
     RECONNECT_DELAY,
-    ENCODING_DEFAULT
 )
 
 from tarantool.error import (
@@ -21,6 +20,9 @@
     SchemaError
 )
 
+from tarantool.utils import (
+    ENCODING_DEFAULT
+)
 
 __version__ = "0.5.5"
 

tarantool/connection.py

@@ -5,21 +5,20 @@
 '''
 
 import os
-import six
-import copy
 import time
 import errno
-import ctypes
-import ctypes.util
 import socket
-import msgpack
 
+import ctypes
+import ctypes.util
 try:
     from ctypes import c_ssize_t
 except ImportError:
     from ctypes import c_longlong as c_ssize_t
 
-import tarantool
+import msgpack
+
+import tarantool.error
 from tarantool.response import Response
 from tarantool.request import (
     Request,
@@ -45,19 +44,26 @@
     REQUEST_TYPE_OK,
     REQUEST_TYPE_ERROR,
     IPROTO_GREETING_SIZE,
-    ENCODING_DEFAULT,
     ITERATOR_EQ,
     ITERATOR_ALL
 )
 from tarantool.error import (
     NetworkError,
-    # DatabaseError,
+    DatabaseError,
+    InterfaceError,
+    SchemaError,
     NetworkWarning,
     SchemaReloadException,
     warn
 )
 from tarantool.schema import Schema
-from tarantool.utils import check_key, greeting_decode, version_id
+from tarantool.utils import (
+    check_key,
+    greeting_decode,
+    version_id,
+    string_types,
+    ENCODING_DEFAULT,
+)
 
 
 class Connection(object):
@@ -70,10 +76,10 @@ class Connection(object):
     (insert/delete/update/select).
     '''
     Error = tarantool.error
-    DatabaseError = tarantool.error.DatabaseError
-    InterfaceError = tarantool.error.InterfaceError
-    SchemaError = tarantool.error.SchemaError
-    NetworkError = tarantool.error.NetworkError
+    DatabaseError = DatabaseError
+    InterfaceError = InterfaceError
+    SchemaError = SchemaError
+    NetworkError = NetworkError
 
     def __init__(self, host, port,
                  user=None,
@@ -376,7 +382,7 @@ def replace(self, space_name, values):
 
         :rtype: `Response` instance
         '''
-        if isinstance(space_name, six.string_types):
+        if isinstance(space_name, string_types):
             space_name = self.schema.get_space(space_name).sid
         request = RequestReplace(self, space_name, values)
         return self._send_request(request)
@@ -433,7 +439,7 @@ class JoinState:
     def _ops_process(self, space, update_ops):
         new_ops = []
         for op in update_ops:
-            if isinstance(op[1], six.string_types):
+            if isinstance(op[1], string_types):
                 op = list(op)
                 op[1] = self.schema.get_field(space, op[1])['id']
             new_ops.append(op)
@@ -469,7 +475,7 @@ def insert(self, space_name, values):
 
         :rtype: `Response` instance
         '''
-        if isinstance(space_name, six.string_types):
+        if isinstance(space_name, string_types):
             space_name = self.schema.get_space(space_name).sid
         request = RequestInsert(self, space_name, values)
         return self._send_request(request)
@@ -490,9 +496,9 @@ def delete(self, space_name, key, **kwargs):
         index_name = kwargs.get("index", 0)
 
         key = check_key(key)
-        if isinstance(space_name, six.string_types):
+        if isinstance(space_name, string_types):
             space_name = self.schema.get_space(space_name).sid
-        if isinstance(index_name, six.string_types):
+        if isinstance(index_name, 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)
@@ -561,9 +567,9 @@ def upsert(self, space_name, tuple_value, op_list, **kwargs):
         '''
         index_name = kwargs.get("index", 0)
 
-        if isinstance(space_name, six.string_types):
+        if isinstance(space_name, string_types):
             space_name = self.schema.get_space(space_name).sid
-        if isinstance(index_name, six.string_types):
+        if isinstance(index_name, string_types):
             index_name = self.schema.get_index(space_name, index_name).iid
         op_list = self._ops_process(space_name, op_list)
         request = RequestUpsert(self, space_name, index_name, tuple_value,
@@ -636,9 +642,9 @@ def update(self, space_name, key, op_list, **kwargs):
         index_name = kwargs.get("index", 0)
 
         key = check_key(key)
-        if isinstance(space_name, six.string_types):
+        if isinstance(space_name, string_types):
             space_name = self.schema.get_space(space_name).sid
-        if isinstance(index_name, six.string_types):
+        if isinstance(index_name, string_types):
             index_name = self.schema.get_index(space_name, index_name).iid
         op_list = self._ops_process(space_name, op_list)
         request = RequestUpdate(self, space_name, index_name, key, op_list)
@@ -719,9 +725,9 @@ def select(self, space_name, key=None, **kwargs):
         # tuples)
         key = check_key(key, select=True)
 
-        if isinstance(space_name, six.string_types):
+        if isinstance(space_name, string_types):
             space_name = self.schema.get_space(space_name).sid
-        if isinstance(index_name, six.string_types):
+        if isinstance(index_name, 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/const.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=C0301,W0105,W0401,W0614
 
-import sys
-
-#
 IPROTO_CODE = 0x00
 IPROTO_SYNC = 0x01
 # replication keys (header)
@@ -86,8 +83,3 @@
 RECONNECT_MAX_ATTEMPTS = 10
 # Default delay between attempts to reconnect (seconds)
 RECONNECT_DELAY = 0.1
-
-if sys.version_info.major == 2:
-    ENCODING_DEFAULT = None
-else:
-    ENCODING_DEFAULT = "utf-8"

tarantool/request.py

@@ -4,11 +4,10 @@
 Request types definitions
 '''
 
-import six
-import sys
 import msgpack
 import hashlib
 
+
 from tarantool.const import (
     IPROTO_CODE,
     IPROTO_SYNC,
@@ -42,7 +41,10 @@
     REQUEST_TYPE_JOIN,
     REQUEST_TYPE_SUBSCRIBE
 )
-
+from tarantool.utils import (
+    strxor,
+    binary_types
+)
 
 class Request(object):
     '''
@@ -60,6 +62,7 @@ def __init__(self, conn):
         self._bytes = None
         self.conn = conn
         self._sync = None
+        self._body = ''
 
     def __bytes__(self):
         return self.header(len(self._body)) + self._body
@@ -117,18 +120,12 @@ def sha1(values):
             sha = hashlib.sha1()
             for i in values:
                 if i is not None:
-                    if isinstance(i, six.binary_type):
+                    if isinstance(i, binary_types):
                         sha.update(i)
                     else:
                         sha.update(i.encode())
             return sha.digest()
 
-        def strxor(rhs, lhs):
-            if sys.version_info.major == 2:
-                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,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=C0301,W0105,W0401,W0614
 
-import sys
+import collections
+
 import yaml
 import msgpack
-import collections
 
 from tarantool.const import (
     IPROTO_CODE,
@@ -22,10 +22,6 @@
 )
 
 
-if sys.version_info < (2, 6):
-    bytes = str    # pylint: disable=W0622
-
-
 class Response(collections.Sequence):
     '''
     Represents a single response from the server in compliance with the
@@ -46,8 +42,8 @@ def __init__(self, conn, response):
         '''
 
         # This is not necessary, because underlying list data structures are
-        # created in the __new__(). But let it be.
-        super(Response, self).__init__()
+        # created in the __new__().
+        # super(Response, self).__init__()
 
         if conn.encoding is not None:
             unpacker = msgpack.Unpacker(use_list=True, encoding=conn.encoding)

tarantool/schema.py

@@ -5,9 +5,14 @@
 It is a Tarantool schema description.
 '''
 
-import six
-
-from tarantool.error import SchemaError, DatabaseError
+from tarantool.utils import (
+    string_types,
+    integer_types,
+)
+from tarantool.error import (
+    SchemaError,
+    DatabaseError
+)
 import tarantool.const as const
 
 
@@ -87,7 +92,7 @@ def fetch_space(self, space):
             )
         elif len(space_row) == 0 or not len(space_row[0]):
             # We can't find space with this name or id
-            temp_name = 'name' if isinstance(space, six.string_types) else 'id'
+            temp_name = 'name' if isinstance(space, string_types) else 'id'
             errmsg = "There's no space with {1} '{0}'".format(space, temp_name)
             raise SchemaError(errmsg)
 
@@ -97,7 +102,7 @@ def fetch_space(self, space):
 
     def fetch_space_from(self, space):
         _index = None
-        if isinstance(space, six.string_types):
+        if isinstance(space, string_types):
             _index = const.INDEX_SPACE_NAME
         else:
             _index = const.INDEX_SPACE_PRIMARY
@@ -145,7 +150,7 @@ def fetch_index(self, space_object, index):
             )
         elif len(index_row) == 0 or not len(index_row[0]):
             # We can't find index with this name or id
-            temp_name = 'name' if isinstance(index, six.string_types) else 'id'
+            temp_name = 'name' if isinstance(index, string_types) else 'id'
             errmsg = ("There's no index with {2} '{0}'"
                       " in space '{1}'").format(index, space_object.name,
                                                 temp_name)
@@ -162,7 +167,7 @@ def fetch_index_all(self):
 
     def fetch_index_from(self, space, index):
         _index = None
-        if isinstance(index, six.string_types):
+        if isinstance(index, string_types):
             _index = const.INDEX_INDEX_NAME
         else:
             _index = const.INDEX_INDEX_PRIMARY
@@ -199,7 +204,7 @@ def get_field(self, space, field):
         try:
             return _space.format[field]
         except:
-            tp = 'name' if isinstance(field, six.string_types) else 'id'
+            tp = 'name' if isinstance(field, string_types) else 'id'
             errmsg = "There's no field with {2} '{0}' in space '{1}'".format(
                     field, _space.name, tp
             )

tarantool/utils.py

@@ -1,9 +1,32 @@
 # -*- coding: utf-8 -*-
-
-import six
+import sys
 import base64
 import uuid
 
+# Compatibility layer for Python2/Python3
+if sys.version_info.major == 2:
+    string_types     = (basestring, )
+    integer_types    = (int, long)
+    ENCODING_DEFAULT = None
+    if sys.version_info.minor < 6:
+        binary_types = (str, )
+    else:
+        binary_types = (bytes, )
+
+    def strxor(rhs, lhs):
+        return "".join(chr(ord(x) ^ ord(y)) for x, y in zip(rhs, lhs))
+
+elif sys.version_info.major == 3:
+    binary_types  = (bytes, )
+    string_types  = (str, )
+    integer_types = (int, )
+    ENCODING_DEFAULT = "utf-8"
+
+    def strxor(rhs, lhs):
+        return bytes([x ^ y for x, y in zip(rhs, lhs)])
+
+else:
+    pass # unreachable
 
 def check_key(*args, **kwargs):
     if 'first' not in kwargs:
@@ -19,14 +42,13 @@ def check_key(*args, **kwargs):
         elif args[0] is None and kwargs['select']:
             return []
     for key in args:
-        assert isinstance(key, six.integer_types + six.string_types + (float,))
+        assert isinstance(key, integer_types + string_types + (float,))
     return list(args)
 
 
 def version_id(major, minor, patch):
     return (((major << 8) | minor) << 8) | patch
 
-
 def greeting_decode(greeting_buf):
     class Greeting:
         version_id = 0