diff options
Diffstat (limited to 'lib/sqlalchemy/connectors/pyodbc.py')
| -rw-r--r-- | lib/sqlalchemy/connectors/pyodbc.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py index 8261d0722..bc8a2f0b8 100644 --- a/lib/sqlalchemy/connectors/pyodbc.py +++ b/lib/sqlalchemy/connectors/pyodbc.py @@ -66,17 +66,17 @@ class PyODBCConnector(Connector): connectors = [util.unquote_plus(keys.pop('odbc_connect'))] else: dsn_connection = 'dsn' in keys or \ - ('host' in keys and 'database' not in keys) + ('host' in keys and 'database' not in keys) if dsn_connection: - connectors = ['dsn=%s' % (keys.pop('host', '') or \ - keys.pop('dsn', ''))] + connectors = ['dsn=%s' % (keys.pop('host', '') or + keys.pop('dsn', ''))] else: port = '' - if 'port' in keys and not 'port' in query: + if 'port' in keys and 'port' not in query: port = ',%d' % int(keys.pop('port')) connectors = ["DRIVER={%s}" % - keys.pop('driver', self.pyodbc_driver_name), + keys.pop('driver', self.pyodbc_driver_name), 'Server=%s%s' % (keys.pop('host', ''), port), 'Database=%s' % keys.pop('database', '')] @@ -93,7 +93,7 @@ class PyODBCConnector(Connector): # you query a cp1253 encoded database from a latin1 client... if 'odbc_autotranslate' in keys: connectors.append("AutoTranslate=%s" % - keys.pop("odbc_autotranslate")) + keys.pop("odbc_autotranslate")) connectors.extend(['%s=%s' % (k, v) for k, v in keys.items()]) return [[";".join(connectors)], connect_args] @@ -101,7 +101,7 @@ class PyODBCConnector(Connector): def is_disconnect(self, e, connection, cursor): if isinstance(e, self.dbapi.ProgrammingError): return "The cursor's connection has been closed." in str(e) or \ - 'Attempt to use a closed connection.' in str(e) + 'Attempt to use a closed connection.' in str(e) elif isinstance(e, self.dbapi.Error): return '[08S01]' in str(e) else: @@ -117,9 +117,9 @@ class PyODBCConnector(Connector): _sql_driver_name = dbapi_con.getinfo(pyodbc.SQL_DRIVER_NAME) self.freetds = bool(re.match(r".*libtdsodbc.*\.so", _sql_driver_name - )) + )) self.easysoft = bool(re.match(r".*libessqlsrv.*\.so", _sql_driver_name - )) + )) if self.freetds: self.freetds_driver_version = dbapi_con.getinfo( @@ -149,9 +149,9 @@ class PyODBCConnector(Connector): def _parse_dbapi_version(self, vers): m = re.match( - r'(?:py.*-)?([\d\.]+)(?:-(\w+))?', - vers - ) + r'(?:py.*-)?([\d\.]+)(?:-(\w+))?', + vers + ) if not m: return () vers = tuple([int(x) for x in m.group(1).split(".")]) |