diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-07-03 18:55:29 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-07-03 18:55:29 -0400 |
| commit | 516d675c329bce776efb4728d5237a0586adebf1 (patch) | |
| tree | 36e79775c6f53fe128142a1c07bc8aa05f77abfe /lib/sqlalchemy/connectors | |
| parent | 55ae7d784212c3b03ba74d27e1e088486054c993 (diff) | |
| download | sqlalchemy-516d675c329bce776efb4728d5237a0586adebf1.tar.gz | |
- idle 78-char adjustments
Diffstat (limited to 'lib/sqlalchemy/connectors')
| -rw-r--r-- | lib/sqlalchemy/connectors/mxodbc.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/connectors/pyodbc.py | 24 | ||||
| -rw-r--r-- | lib/sqlalchemy/connectors/zxJDBC.py | 8 |
3 files changed, 23 insertions, 12 deletions
diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py index 816474d43..4c4b0b070 100644 --- a/lib/sqlalchemy/connectors/mxodbc.py +++ b/lib/sqlalchemy/connectors/mxodbc.py @@ -114,7 +114,8 @@ class MxODBCConnector(Connector): return False def _get_server_version_info(self, connection): - # eGenix suggests using conn.dbms_version instead of what we're doing here + # eGenix suggests using conn.dbms_version instead + # of what we're doing here dbapi_con = connection.connection version = [] r = re.compile('[.\-]') diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py index b291f3e16..9f56955b3 100644 --- a/lib/sqlalchemy/connectors/pyodbc.py +++ b/lib/sqlalchemy/connectors/pyodbc.py @@ -43,15 +43,18 @@ class PyODBCConnector(Connector): if 'odbc_connect' in keys: connectors = [urllib.unquote_plus(keys.pop('odbc_connect'))] else: - dsn_connection = 'dsn' in keys or ('host' in keys and 'database' not in keys) + dsn_connection = 'dsn' in keys or \ + ('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: port = ',%d' % int(keys.pop('port')) - connectors = ["DRIVER={%s}" % keys.pop('driver', self.pyodbc_driver_name), + connectors = ["DRIVER={%s}" % + keys.pop('driver', self.pyodbc_driver_name), 'Server=%s%s' % (keys.pop('host', ''), port), 'Database=%s' % keys.pop('database', '') ] @@ -62,12 +65,13 @@ class PyODBCConnector(Connector): else: connectors.append("Trusted_Connection=Yes") - # if set to 'Yes', the ODBC layer will try to automagically convert - # textual data from your database encoding to your client encoding - # This should obviously be set to 'No' if you query a cp1253 encoded - # database from a latin1 client... + # if set to 'Yes', the ODBC layer will try to automagically + # convert textual data from your database encoding to your + # client encoding. This should obviously be set to 'No' if + # you query a cp1253 encoded database from a latin1 client... if 'odbc_autotranslate' in keys: - connectors.append("AutoTranslate=%s" % keys.pop("odbc_autotranslate")) + connectors.append("AutoTranslate=%s" % + keys.pop("odbc_autotranslate")) connectors.extend(['%s=%s' % (k,v) for k,v in keys.iteritems()]) return [[";".join (connectors)], connect_args] @@ -89,7 +93,9 @@ class PyODBCConnector(Connector): dbapi_con = connection.connection - self.freetds = bool(re.match(r".*libtdsodbc.*\.so", dbapi_con.getinfo(pyodbc.SQL_DRIVER_NAME))) + self.freetds = bool(re.match(r".*libtdsodbc.*\.so", + dbapi_con.getinfo(pyodbc.SQL_DRIVER_NAME) + )) # the "Py2K only" part here is theoretical. # have not tried pyodbc + python3.1 yet. diff --git a/lib/sqlalchemy/connectors/zxJDBC.py b/lib/sqlalchemy/connectors/zxJDBC.py index ae4312880..0b15bfddf 100644 --- a/lib/sqlalchemy/connectors/zxJDBC.py +++ b/lib/sqlalchemy/connectors/zxJDBC.py @@ -27,13 +27,17 @@ class ZxJDBCConnector(Connector): def _create_jdbc_url(self, url): """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 '', + url.port is not None + 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], + return [ + [self._create_jdbc_url(url), + url.username, url.password, + self.jdbc_driver_name], opts] def is_disconnect(self, e): |
