summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Jarrett <celttechie@gmail.com>2014-07-10 19:13:53 -0600
committerBrian Jarrett <celttechie@gmail.com>2014-07-12 13:28:16 -0600
commit5cc0b2b1182b74af3aed9d9e87b135a8941d9c81 (patch)
treef0d657970821f83a2f548e18c4e238a000bb800b
parent600e6bfb3fa261b98b1ae7237080c8f5e757d09a (diff)
downloadsqlalchemy-pr/107.tar.gz
PEP8 style fixes for connectors packagepr/107
-rw-r--r--lib/sqlalchemy/connectors/mxodbc.py6
-rw-r--r--lib/sqlalchemy/connectors/pyodbc.py24
-rw-r--r--lib/sqlalchemy/connectors/zxJDBC.py10
3 files changed, 20 insertions, 20 deletions
diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py
index 355ef2482..851dc11e8 100644
--- a/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@ -80,8 +80,8 @@ class MxODBCConnector(Connector):
if issubclass(errorclass, MxOdbcWarning):
errorclass.__bases__ = (Warning,)
warnings.warn(message=str(errorvalue),
- category=errorclass,
- stacklevel=2)
+ category=errorclass,
+ stacklevel=2)
else:
raise errorclass(errorvalue)
return error_handler
@@ -135,7 +135,7 @@ class MxODBCConnector(Connector):
def _get_direct(self, context):
if context:
native_odbc_execute = context.execution_options.\
- get('native_odbc_execute', 'auto')
+ get('native_odbc_execute', 'auto')
# default to direct=True in all cases, is more generally
# compatible especially with SQL Server
return False if native_odbc_execute is True else True
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(".")])
diff --git a/lib/sqlalchemy/connectors/zxJDBC.py b/lib/sqlalchemy/connectors/zxJDBC.py
index a3c6bd1f5..c0af742fa 100644
--- a/lib/sqlalchemy/connectors/zxJDBC.py
+++ b/lib/sqlalchemy/connectors/zxJDBC.py
@@ -36,17 +36,17 @@ class ZxJDBCConnector(Connector):
"""Create a JDBC url from a :class:`~sqlalchemy.engine.url.URL`"""
return 'jdbc:%s://%s%s/%s' % (self.jdbc_db_name, url.host,
url.port is not None
- and ':%s' % url.port or '',
+ and ':%s' % url.port or '',
url.database)
def create_connect_args(self, url):
opts = self._driver_kwargs()
opts.update(url.query)
return [
- [self._create_jdbc_url(url),
- url.username, url.password,
- self.jdbc_driver_name],
- opts]
+ [self._create_jdbc_url(url),
+ url.username, url.password,
+ self.jdbc_driver_name],
+ opts]
def is_disconnect(self, e, connection, cursor):
if not isinstance(e, self.dbapi.ProgrammingError):