just a pep8 pass of lib/sqlalchemy/connectors

diff --git a/lib/sqlalchemy/connectors/__init__.py b/lib/sqlalchemy/connectors/__init__.py
index 5a0e2eb242b69ab2b5149b83b34ec3d286b7efd0..97ac5232c252fc83e18db3db625fc374db119f36 100644 (file)
--- a/lib/sqlalchemy/connectors/__init__.py
+++ b/lib/sqlalchemy/connectors/__init__.py
@@ -7,4 +7,3 @@
 
 class Connector(object):
     pass
-

diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py
index d74e9639b3f9befc7e4b38c03952cb1b1fe1a4c9..5f6fa8fc84374e69f53889813cf85f0f5d947565 100644 (file)
--- a/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@ -24,8 +24,9 @@ import warnings
 
 from . import Connector
 
+
 class MxODBCConnector(Connector):
-    driver='mxodbc'
+    driver = 'mxodbc'
 
     supports_sane_multi_rowcount = False
     supports_unicode_statements = True
@@ -47,7 +48,7 @@ class MxODBCConnector(Connector):
         elif platform == 'darwin':
             from mx.ODBC import iODBC as module
         else:
-            raise ImportError, "Unrecognized platform for mxODBC import"
+            raise ImportError("Unrecognized platform for mxODBC import")
         return module
 
     @classmethod
@@ -73,8 +74,8 @@ class MxODBCConnector(Connector):
         emit Python standard warnings.
         """
         from mx.ODBC.Error import Warning as MxOdbcWarning
-        def error_handler(connection, cursor, errorclass, errorvalue):
 
+        def error_handler(connection, cursor, errorclass, errorvalue):
             if issubclass(errorclass, MxOdbcWarning):
                 errorclass.__bases__ = (Warning,)
                 warnings.warn(message=str(errorvalue),
@@ -141,7 +142,8 @@ class MxODBCConnector(Connector):
             return True
 
     def do_executemany(self, cursor, statement, parameters, context=None):
-        cursor.executemany(statement, parameters, direct=self._get_direct(context))
+        cursor.executemany(
+            statement, parameters, direct=self._get_direct(context))
 
     def do_execute(self, cursor, statement, parameters, context=None):
         cursor.execute(statement, parameters, direct=self._get_direct(context))

diff --git a/lib/sqlalchemy/connectors/mysqldb.py b/lib/sqlalchemy/connectors/mysqldb.py
index 4479deafec6df1784b4266b5a9af688f6fe486ee..5f4b3e4d329d0fd3a73de83155399d23dcae05e6 100644 (file)
--- a/lib/sqlalchemy/connectors/mysqldb.py
+++ b/lib/sqlalchemy/connectors/mysqldb.py
@@ -10,9 +10,11 @@ from ..sql import operators as sql_operators
 from .. import exc, log, schema, sql, types as sqltypes, util, processors
 import re
 
+
 # the subclassing of Connector by all classes
 # here is not strictly necessary
 
+
 class MySQLDBExecutionContext(Connector):
 
     @property
@@ -22,6 +24,7 @@ class MySQLDBExecutionContext(Connector):
         else:
             return self.cursor.rowcount
 
+
 class MySQLDBCompiler(Connector):
     def visit_mod_binary(self, binary, operator, **kw):
         return self.process(binary.left, **kw) + " %% " + \
@@ -30,12 +33,14 @@ class MySQLDBCompiler(Connector):
     def post_process_text(self, text):
         return text.replace('%', '%%')
 
+
 class MySQLDBIdentifierPreparer(Connector):
 
     def _escape_identifier(self, value):
         value = value.replace(self.escape_quote, self.escape_to_quote)
         return value.replace("%", "%%")
 
+
 class MySQLDBConnector(Connector):
     driver = 'mysqldb'
     supports_unicode_statements = False
@@ -76,7 +81,8 @@ class MySQLDBConnector(Connector):
         # query string.
 
         ssl = {}
-        for key in ['ssl_ca', 'ssl_key', 'ssl_cert', 'ssl_capath', 'ssl_cipher']:
+        keys = ['ssl_ca', 'ssl_key', 'ssl_cert', 'ssl_capath', 'ssl_cipher']
+        for key in keys:
             if key in opts:
                 ssl[key[4:]] = opts[key]
                 util.coerce_kw_type(ssl, key[4:], str)
@@ -148,4 +154,3 @@ class MySQLDBConnector(Connector):
                     "combination of MySQL server and MySQL-python. "
                     "MySQL-python >= 1.2.2 is recommended.  Assuming latin1.")
                 return 'latin1'
-

diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py
index 7ef0922cf7a92b265967ff5a74a002d6ec3e3654..678d50f4c5229260474613ea87ae73a45dc0c03f 100644 (file)
--- a/lib/sqlalchemy/connectors/pyodbc.py
+++ b/lib/sqlalchemy/connectors/pyodbc.py
@@ -11,8 +11,9 @@ import sys
 import re
 import urllib
 
+
 class PyODBCConnector(Connector):
-    driver='pyodbc'
+    driver = 'pyodbc'
 
     supports_sane_multi_rowcount = False
     # PyODBC unicode is broken on UCS-4 builds
@@ -63,7 +64,7 @@ class PyODBCConnector(Connector):
             dsn_connection = 'dsn' in keys or \
                             ('host' in keys and 'database' not in keys)
             if dsn_connection:
-                connectors= ['dsn=%s' % (keys.pop('host', '') or \
+                connectors = ['dsn=%s' % (keys.pop('host', '') or \
                             keys.pop('dsn', ''))]
             else:
                 port = ''
@@ -73,7 +74,7 @@ class PyODBCConnector(Connector):
                 connectors = ["DRIVER={%s}" %
                                 keys.pop('driver', self.pyodbc_driver_name),
                               'Server=%s%s' % (keys.pop('host', ''), port),
-                              'Database=%s' % keys.pop('database', '') ]
+                              'Database=%s' % keys.pop('database', '')]
 
             user = keys.pop("user", None)
             if user:
@@ -90,8 +91,8 @@ class PyODBCConnector(Connector):
                 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]
+            connectors.extend(['%s=%s' % (k, v) for k, v in keys.iteritems()])
+        return [[";".join(connectors)], connect_args]
 
     def is_disconnect(self, e, connection, cursor):
         if isinstance(e, self.dbapi.ProgrammingError):
@@ -117,18 +118,20 @@ class PyODBCConnector(Connector):
                             ))
 
         if self.freetds:
-            self.freetds_driver_version = dbapi_con.getinfo(pyodbc.SQL_DRIVER_VER)
+            self.freetds_driver_version = dbapi_con.getinfo(
+                pyodbc.SQL_DRIVER_VER)
 
         # the "Py2K only" part here is theoretical.
         # have not tried pyodbc + python3.1 yet.
         # Py2K
-        self.supports_unicode_statements = not self.freetds and not self.easysoft
+        self.supports_unicode_statements = (
+            not self.freetds and not self.easysoft)
         if self._user_supports_unicode_binds is not None:
             self.supports_unicode_binds = self._user_supports_unicode_binds
         else:
-            self.supports_unicode_binds = (not self.freetds or
-                                            self.freetds_driver_version >= '0.91'
-                                            ) and not self.easysoft
+            self.supports_unicode_binds = (
+                not self.freetds or self.freetds_driver_version >= '0.91'
+            ) and not self.easysoft
         # end Py2K
 
         # run other initialization which asks for user name, etc.

diff --git a/lib/sqlalchemy/connectors/zxJDBC.py b/lib/sqlalchemy/connectors/zxJDBC.py
index 1db7a619dc6f59026b5348afeefc1bde7636e1f3..433e02745dc4dff4dd6569d82a45cba53f515c1f 100644 (file)
--- a/lib/sqlalchemy/connectors/zxJDBC.py
+++ b/lib/sqlalchemy/connectors/zxJDBC.py
@@ -7,6 +7,7 @@
 import sys
 from . import Connector
 
+
 class ZxJDBCConnector(Connector):
     driver = 'zxjdbc'