fix 3.4 compatibility issues

Author: dimitri-yatsenko

datajoint/connection.py

@@ -16,12 +16,11 @@
 client_errors = (client.err.InterfaceError, client.err.DatabaseError)
 
 
-def translate_query_error(client_error, query, args):
+def translate_query_error(client_error, query):
     """
     Take client error and original query and return the corresponding DataJoint exception.
     :param client_error: the exception raised by the client interface
     :param query: sql query with placeholders
-    :param args: values for query placeholders
     :return: an instance of the corresponding subclass of datajoint.errors.DataJointError
     """
     # Loss of connection errors
@@ -34,20 +33,20 @@ def translate_query_error(client_error, query, args):
         return errors.LostConnectionError(disconnect_codes[client_error.args[0]], *client_error.args[1:])
     # Access errors
     if isinstance(client_error, client.err.OperationalError) and client_error.args[0] in (1044, 1142):
-        return errors.AccessError('Insufficient privileges.', *client_error.args[1:], query)
+        return errors.AccessError('Insufficient privileges.', client_error.args[1],  query)
     # Integrity errors
     if isinstance(client_error, client.err.IntegrityError) and client_error.args[0] == 1062:
         return errors.DuplicateError(*client_error.args[1:])
     if isinstance(client_error, client.err.IntegrityError) and client_error.args[0] == 1452:
         return errors.IntegrityError(*client_error.args[1:])
     # Syntax Errors
     if isinstance(client_error, client.err.ProgrammingError) and client_error.args[0] == 1064:
-        return errors.QuerySyntaxError(*client_error.args[1:], query)
+        return errors.QuerySyntaxError(client_error.args[1], query)
     # Existence Errors
     if isinstance(client_error, client.err.ProgrammingError) and client_error.args[0] == 1146:
-        return errors.MissingTableError(*args[1:], query)
+        return errors.MissingTableError(client_error.args[1], query)
     if isinstance(client_error, client.err.InternalError) and client_error.args[0] == 1364:
-        return errors.MissingAttributeError(*args[1:])
+        return errors.MissingAttributeError(*client_error.args[1:])
     raise client_error
 
 
@@ -188,7 +187,7 @@ def __execute_query(cursor, query, args, cursor_class, suppress_warnings):
                     warnings.simplefilter("ignore")
                 cursor.execute(query, args)
         except client_errors as err:
-            raise translate_query_error(err, query, args)
+            raise translate_query_error(err, query)
 
     def query(self, query, args=(), *, as_dict=False, suppress_warnings=True, reconnect=None):
         """

tests/__init__.py

@@ -11,7 +11,7 @@
 from distutils.version import LooseVersion
 import os
 from pathlib import Path
-from minio import Minio
+import minio
 import urllib3
 import certifi
 import shutil
@@ -96,11 +96,12 @@
         )
 
 # Initialize minioClient with an endpoint and access/secret keys.
-minioClient = Minio(S3_CONN_INFO['endpoint'],
-                    access_key=S3_CONN_INFO['access_key'],
-                    secret_key=S3_CONN_INFO['secret_key'],
-                    secure=False,
-                    http_client=httpClient)
+minioClient = minio.Minio(
+    S3_CONN_INFO['endpoint'],
+    access_key=S3_CONN_INFO['access_key'],
+    secret_key=S3_CONN_INFO['secret_key'],
+    secure=False,
+    http_client=httpClient)
 
 
 def setup_package():
@@ -128,7 +129,10 @@ def setup_package():
         "/external-legacy-data/s3"
     bucket = "migrate-test"
     region = "us-east-1"
-    minioClient.make_bucket(bucket, location=region)
+    try:
+        minioClient.make_bucket(bucket, location=region)
+    except minio.error.BucketAlreadyOwnedByYou:
+        pass
 
     pathlist = Path(source).glob('**/*')
     for path in pathlist:
@@ -138,15 +142,20 @@ def setup_package():
                         str(path),
                         '{}/{}'.format(source, bucket)
                         ), str(path))
-
     # Add S3
-    minioClient.make_bucket("datajoint-test", location=region)
+    try:
+        minioClient.make_bucket("datajoint-test", location=region)
+    except minio.error.BucketAlreadyOwnedByYou:
+        pass
 
     # Add old File Content
-    shutil.copytree(
-            os.path.dirname(os.path.realpath(__file__)) +
-            "/external-legacy-data/file/temp",
-            os.path.expanduser('~/temp'))
+    try:
+        shutil.copytree(
+                os.path.dirname(os.path.realpath(__file__)) +
+                "/external-legacy-data/file/temp",
+                os.path.expanduser('~/temp'))
+    except FileExistsError:
+        pass
 
 
 def teardown_package():

tests/test_relation.py

@@ -4,7 +4,6 @@
 import numpy as np
 from nose.tools import assert_equal, assert_not_equal, assert_true, assert_list_equal, raises
 import datajoint as dj
-from datajoint import utils, DataJointError
 from datajoint.table import Table
 from unittest.mock import patch
 
@@ -189,7 +188,7 @@ def test_skip_duplicate(self):
             dtype=self.subject.heading.as_dtype)
         self.subject.insert(tmp, skip_duplicates=True)
 
-    @raises(DataJointError)
+    @raises(dj.errors.DuplicateError)
     def test_not_skip_duplicate(self):
         """Tests if duplicates are not skipped."""
         tmp = np.array([
@@ -199,7 +198,7 @@ def test_not_skip_duplicate(self):
             dtype=self.subject.heading.as_dtype)
         self.subject.insert(tmp, skip_duplicates=False)
 
-    @raises(dj.DataJointError)
+    @raises(dj.errors.MissingAttributeError)
     def test_no_error_suppression(self):
         """skip_duplicates=True should not suppress other errors"""
         self.test.insert([dict(key=100)], skip_duplicates=True)
@@ -211,12 +210,12 @@ def test_blob_insert(self):
         Y = self.img.fetch()[0]['img']
         assert_true(np.all(X == Y), 'Inserted and retrieved image are not identical')
 
-    @raises(DataJointError)
+    @raises(dj.DataJointError)
     def test_drop(self):
         """Tests dropping tables"""
         dj.config['safemode'] = True
         try:
-            with patch.object(utils, "input", create=True, return_value='yes'):
+            with patch.object(dj.utils, "input", create=True, return_value='yes'):
                 self.trash.drop()
         except:
             pass