removed _pyodbcwrap (buggy and unused)

The CW issue with SQLServer and concurrency was a setting issue on the database.

1 files changed, 1 insertions, 66 deletions

diff --git a/db.py b/db.py
index 3dca8f7..3d31444 100644
--- a/db.py
+++ b/db.py
@@ -313,32 +313,6 @@ class _Psycopg2Adapter(_PsycopgAdapter):
             #import cStringIO
             #extensions.register_adapter(cStringIO.StringIO, adapt_stringio)
 
-class _pyodbcwrappedPsycoPg2Adapter(_Psycopg2Adapter):
-    """
-    used to test and debug _pyodbcwrap under Linux.
-    No sense in using this class in production.
-    """
-    def process_value(self, value, description, encoding='utf-8', binarywrap=None):
-        #return _Psycopg2Adapter.process_value(self, value, description, encoding, binarywrap)
-        # if the dbapi module isn't supporting type codes, override to return value directly
-        typecode = description[1]
-        assert typecode is not None, self
-        if typecode == self.STRING:
-            if isinstance(value, str):
-                return unicode(value, encoding, 'replace')
-        elif typecode == self.BOOLEAN:
-            return bool(value)
-        elif typecode == self.BINARY and not binarywrap is None:
-            #print "*"*500
-            #print 'binary', binarywrap(value.getbinary())
-            return binarywrap(value.getbinary())
-        elif typecode == self.UNKNOWN:
-            # may occurs on constant selection for instance (e.g. SELECT 'hop')
-            # with postgresql at least
-            if isinstance(value, str):
-                return unicode(value, encoding, 'replace')
-        return value
-
 
 class _PgsqlAdapter(DBAPIAdapter):
     """Simple pyPgSQL Adapter to DBAPI
@@ -792,27 +766,6 @@ class _PyodbcAdapter(_BaseSqlServerAdapter):
             variables['autocommit'] = True
         return self._native_module.connect(**variables)
 
-class _PyodbcAdapterMT(_PyodbcAdapter):
-    def process_value(self, value, description, encoding='utf-8', binarywrap=None):
-        # if the dbapi module isn't supporting type codes, override to return value directly
-        typecode = description[1]
-        assert typecode is not None, self
-        if typecode == self.STRING:
-            if isinstance(value, str):
-                return unicode(value, encoding, 'replace')
-        elif typecode == self.BINARY:  # value is a python buffer
-            if binarywrap is not None:
-                return binarywrap(value.getbinary())
-            else:
-                return value.getbinary()
-        elif typecode == self.UNKNOWN:
-            # may occurs on constant selection for instance (e.g. SELECT 'hop')
-            # with postgresql at least
-            if isinstance(value, str):
-                return unicode(value, encoding, 'replace')
-
-        return value
-
 class _PyodbcSqlServer2000Adapter(_PyodbcAdapter):
     driver = "SQL Server"
 
@@ -822,15 +775,6 @@ class _PyodbcSqlServer2005Adapter(_PyodbcAdapter):
 class _PyodbcSqlServer2008Adapter(_PyodbcAdapter):
     driver = "SQL Server Native Client 10.0"
 
-class _PyodbcSqlServer2000AdapterMT(_PyodbcAdapterMT):
-    driver = "SQL Server"
-
-class _PyodbcSqlServer2005AdapterMT(_PyodbcAdapterMT):
-    driver = "SQL Server Native Client 10.0"
-
-class _PyodbcSqlServer2008AdapterMT(_PyodbcAdapterMT):
-    driver = "SQL Server Native Client 10.0"
-
 class _AdodbapiAdapter(_BaseSqlServerAdapter):
 
     def _connect(self, host='', database='', user='', password='', port=None, extra_args=None):
@@ -859,25 +803,19 @@ class _AdodbapiSqlServer2008Adapter(_AdodbapiAdapter):
 
 
 PREFERED_DRIVERS = {
-    "postgres" : [ #'logilab.common._pyodbcwrap',
-                   'psycopg2', 'psycopg', 'pgdb', 'pyPgSQL.PgSQL',
+    "postgres" : [ 'psycopg2', 'psycopg', 'pgdb', 'pyPgSQL.PgSQL',
                    ],
     "mysql" : [ 'MySQLdb', ], # 'pyMySQL.MySQL, ],
     "sqlite" : ['pysqlite2.dbapi2', 'sqlite', 'sqlite3',],
     "sqlserver2000" : ['pyodbc', 'adodbapi', ],
     "sqlserver2005" : ['pyodbc', 'adodbapi', ],
     "sqlserver2008" : ['pyodbc', 'adodbapi', ],
-    # for use in multithreaded applications, e.g. CubicWeb
-    "sqlserver2000_mt" : ['logilab.common._pyodbcwrap'],
-    "sqlserver2005_mt" : ['logilab.common._pyodbcwrap'],
-    "sqlserver2008_mt" : ['logilab.common._pyodbcwrap'],
     }
 
 _ADAPTERS = {
     'postgres' : { 'pgdb' : _PgdbAdapter,
                    'psycopg' : _PsycopgAdapter,
                    'psycopg2' : _Psycopg2Adapter,
-                   #'logilab.common._pyodbcwrap':  _pyodbcwrappedPsycoPg2Adapter,
                    'pyPgSQL.PgSQL' : _PgsqlAdapter,
                    },
     'mysql' : { 'MySQLdb' : _MySqlDBAdapter, },
@@ -890,9 +828,6 @@ _ADAPTERS = {
                        'pyodbc': _PyodbcSqlServer2005Adapter},
     "sqlserver2008" : {'adodbapi': _AdodbapiSqlServer2008Adapter,
                        'pyodbc': _PyodbcSqlServer2008Adapter},
-    "sqlserver2000_mt" : {'logilab.common._pyodbcwrap': _PyodbcSqlServer2000AdapterMT},
-    "sqlserver2005_mt" : {'logilab.common._pyodbcwrap': _PyodbcSqlServer2005AdapterMT},
-    "sqlserver2008_mt" : {'logilab.common._pyodbcwrap': _PyodbcSqlServer2008AdapterMT},
     }
 
 # _AdapterDirectory could be more generic by adding a 'protocol' parameter