Updated dbapi module to run on python2

implemented close method and activated corresponding unit test
updated super() methods to python2 style
wrote texts of raising errors

Author: artembo

tarantool/dbapi.py

@@ -1,11 +1,11 @@
-"""
-https://www.python.org/dev/peps/pep-0249/
-"""
+from __future__ import unicode_literals
+
 import re
 
 from tarantool.error import InterfaceError
 from .connection import Connection as BaseConnection
 
+
 update_insert_pattern = re.compile(r'^UPDATE|^INSERT', re.IGNORECASE)
 
 
@@ -17,10 +17,10 @@ class Cursor:
     arraysize = 1
     autocommit = True
     closed = False
+    rows = None
 
-    def __init__(self, connection):
-        self._c = connection
-        self.rows = None
+    def __init__(self, conn):
+        self._c = conn
 
     def callproc(self, procname, *params):  # TODO
         """
@@ -34,14 +34,15 @@ def callproc(self, procname, *params):  # TODO
         be made available through the standard .fetch*() methods.
         """
 
-    def close(self):  # TODO
+    def close(self):
         """
         Close the cursor now (rather than whenever __del__ is called).
 
         The cursor will be unusable from this point forward; an Error (or
         subclass) exception will be raised if any operation is attempted with
         the cursor.
         """
+        self._c = None
 
     @staticmethod
     def _convert_param(p):
@@ -90,13 +91,13 @@ def execute(self, query, params=None):
         """
         if self.closed:
             raise self._c.ProgrammingError
+
         if params:
             query = query % tuple(
                 self._convert_param(param) for param in params)
 
         response = self._c.execute(query)
-
-        self.rows = tuple(response.body.values())[1] if len(
+        self.rows = tuple(response.data) if len(
             response.body) > 1 else None
 
         if update_insert_pattern.match(query):
@@ -162,7 +163,7 @@ def fetchone(self):
         .execute*() did not produce any result set or no call was issued yet.
         """
         if self.rows is None:
-            raise self._c.Error
+            raise self._c.ProgrammingError('Nothing to fetch')
         return self.fetchmany(1)[0] if len(self.rows) else None
 
     def fetchmany(self, size=None):
@@ -189,7 +190,7 @@ def fetchmany(self, size=None):
         size = size or self.arraysize
 
         if self.rows is None:
-            raise self._c.ProgrammingError
+            raise self._c.ProgrammingError('Nothing to fetch')
 
         if len(self.rows) < size:
             items = self.rows
@@ -208,7 +209,7 @@ def fetchall(self):
         .execute*() did not produce any result set or no call was issued yet.
         """
         if self.rows is None:
-            raise self._c.ProgrammingError
+            raise self._c.ProgrammingError('Nothing to fetch')
 
         items = self.rows[:]
         self.rows = []
@@ -217,8 +218,7 @@ def fetchall(self):
     def setinputsizes(self, sizes):
         """This can be used before a call to .execute*() to predefine memory
         areas for the operation's parameters.
-
-        sizes is specified as a sequence — one item for each input parameter.
+        sizes is specified as a sequence - one item for each input parameter.
         The item should be a Type Object that corresponds to the input that
         will be used, or it should be an integer specifying the maximum
         length of a string parameter. If the item is None, then no predefined
@@ -231,7 +231,13 @@ def setinputsizes(self, sizes):
         free to not use it."""
 
     def setoutputsize(self, size, column=None):
-        pass
+        """Set a column buffer size for fetches of large columns (e.g. LONGs,
+        BLOBs, etc.). The column is specified as an index into the result
+        sequence. Not specifying the column will set the default size for all
+        large columns in the cursor.
+        This method would be used before the .execute*() method is invoked.
+        Implementations are free to have this method do nothing and users are
+        free to not use it."""
 
 
 class Connection(BaseConnection):
@@ -243,7 +249,7 @@ class Connection(BaseConnection):
     server_version = 2
 
     def connect(self):
-        super().connect()
+        super(Connection, self).connect()
         return self
 
     def commit(self):
@@ -272,8 +278,8 @@ def rollback(self):
 
     def execute(self, query, params=None):
         if self._socket is None:
-            raise self.ProgrammingError
-        return super().execute(query, params)
+            raise self.ProgrammingError('Can not execute on closed connection')
+        return super(Connection, self).execute(query, params)
 
     def close(self):
         """
@@ -289,11 +295,7 @@ def close(self):
             self._socket.close()
             self._socket = None
         else:
-            raise self.ProgrammingError
-
-    def _set_cursor(self):
-        self._cursor = Cursor(self)
-        return self._cursor
+            raise self.ProgrammingError('Connection already closed')
 
     def cursor(self, params=None):
         """
@@ -303,4 +305,4 @@ def cursor(self, params=None):
         will have to emulate cursors using other means to the extent needed
         by this specification.
         """
-        return self._cursor or self._set_cursor()
+        return Cursor(self)

unit/suites/test_dbapi.py

@@ -5,38 +5,43 @@
 import sys
 import unittest
 
-from dbapi20 import DatabaseAPI20Test
+import dbapi20
 
+import tarantool
 from tarantool.dbapi import Connection
 from .lib.tarantool_server import TarantoolServer
 
 
-class TestSuite_DBAPI(DatabaseAPI20Test):
+class TestSuite_DBAPI(dbapi20.DatabaseAPI20Test):
     table_prefix = 'dbapi20test_'  # If you need to specify a prefix for tables
 
     ddl1 = 'create table %sbooze (name varchar(20) primary key)' % table_prefix
     ddl2 = 'create table %sbarflys (name varchar(20) primary key, ' \
            'drink varchar(30))' % table_prefix
 
     @classmethod
-    def setUpClass(cls):
+    def setUpClass(self):
         print(' DBAPI '.center(70, '='), file=sys.stderr)
         print('-' * 70, file=sys.stderr)
-
-    def setUp(self):
         self.srv = TarantoolServer()
         self.srv.script = 'unit/suites/box.lua'
         self.srv.start()
+        self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'])
         self.driver = Connection(self.srv.host, self.srv.args['primary'])
+
+    def setUp(self):
         # prevent a remote tarantool from clean our session
         if self.srv.is_started():
             self.srv.touch_lock()
+        self.con.flush_schema()
+
         # grant full access to guest
         self.srv.admin("box.schema.user.grant('guest', 'create,read,write,"
                        "execute', 'universe')")
 
-    def tearDown(self):
-        # self.driver.close()
+    @classmethod
+    def tearDownClass(self):
+        self.con.close()
         self.srv.stop()
         self.srv.clean()
 
@@ -84,14 +89,9 @@ def test_nextset(self):
     def test_callproc(self):
         pass
 
-    @unittest.skip('To do')
-    def test_setoutputsize(self):
+    def test_setoutputsize(self):  # Do nothing
         pass
 
     @unittest.skip('To do')
     def test_description(self):
         pass
-
-    @unittest.skip('To do')
-    def test_close(self):
-        pass