78 chars for sybase

3 files changed, 37 insertions, 21 deletions

diff --git a/lib/sqlalchemy/dialects/sybase/base.py b/lib/sqlalchemy/dialects/sybase/base.py
index 6719b422b..53ceedc2b 100644
--- a/lib/sqlalchemy/dialects/sybase/base.py
+++ b/lib/sqlalchemy/dialects/sybase/base.py
@@ -214,7 +214,8 @@ class SybaseExecutionContext(default.DefaultExecutionContext):
             insert_has_sequence = seq_column is not None
             
             if insert_has_sequence:
-                self._enable_identity_insert = seq_column.key in self.compiled_parameters[0]
+                self._enable_identity_insert = \
+                                seq_column.key in self.compiled_parameters[0]
             else:
                 self._enable_identity_insert = False
             
@@ -227,12 +228,16 @@ class SybaseExecutionContext(default.DefaultExecutionContext):
             # database settings.  this error message should be improved to 
             # include a note about that.
             if not self.should_autocommit:
-                raise exc.InvalidRequestError("The Sybase dialect only supports "
-                                            "DDL in 'autocommit' mode at this time.")
+                raise exc.InvalidRequestError(
+                        "The Sybase dialect only supports "
+                        "DDL in 'autocommit' mode at this time.")
 
-            self.root_connection.engine.logger.info("AUTOCOMMIT (Assuming no Sybase 'ddl in tran')")
+            self.root_connection.engine.logger.info(
+                        "AUTOCOMMIT (Assuming no Sybase 'ddl in tran')")
 
-            self.set_ddl_autocommit(self.root_connection.connection.connection, True)
+            self.set_ddl_autocommit(
+                        self.root_connection.connection.connection, 
+                        True)
             
 
     def post_exec(self):
@@ -242,8 +247,8 @@ class SybaseExecutionContext(default.DefaultExecutionContext):
        if self._enable_identity_insert:
             self.cursor.execute(
                         "SET IDENTITY_INSERT %s OFF" %  
-                                self.dialect.identifier_preparer.
-                                    format_table(self.compiled.statement.table)
+                            self.dialect.identifier_preparer.
+                            format_table(self.compiled.statement.table)
                         )
 
     def get_lastrowid(self):
@@ -289,10 +294,12 @@ class SybaseSQLCompiler(compiler.SQLCompiler):
 
     def visit_extract(self, extract, **kw):
         field = self.extract_map.get(extract.field, extract.field)
-        return 'DATEPART("%s", %s)' % (field, self.process(extract.expr, **kw))
+        return 'DATEPART("%s", %s)' % (
+                            field, self.process(extract.expr, **kw))
 
     def for_update_clause(self, select):
-        # "FOR UPDATE" is only allowed on "DECLARE CURSOR" which SQLAlchemy doesn't use
+        # "FOR UPDATE" is only allowed on "DECLARE CURSOR" 
+        # which SQLAlchemy doesn't use
         return ''
 
     def order_by_clause(self, select, **kw):
@@ -309,18 +316,21 @@ class SybaseSQLCompiler(compiler.SQLCompiler):
 class SybaseDDLCompiler(compiler.DDLCompiler):
     def get_column_specification(self, column, **kwargs):
         colspec = self.preparer.format_column(column) + " " + \
-                                   self.dialect.type_compiler.process(column.type)
+                        self.dialect.type_compiler.process(column.type)
 
         if column.table is None:
-            raise exc.InvalidRequestError("The Sybase dialect requires Table-bound "\
-                                                   "columns in order to generate DDL")
+            raise exc.InvalidRequestError(
+                        "The Sybase dialect requires Table-bound "
+                       "columns in order to generate DDL")
         seq_col = column.table._autoincrement_column
 
         # install a IDENTITY Sequence if we have an implicit IDENTITY column
         if seq_col is column:
-            sequence = isinstance(column.default, sa_schema.Sequence) and column.default
+            sequence = isinstance(column.default, sa_schema.Sequence) \
+                                    and column.default
             if sequence:
-                start, increment = sequence.start or 1, sequence.increment or 1
+                start, increment = sequence.start or 1, \
+                                    sequence.increment or 1
             else:
                 start, increment = 1, 1
             if (start, increment) == (1, 1):
@@ -345,7 +355,8 @@ class SybaseDDLCompiler(compiler.DDLCompiler):
         index = drop.element
         return "\nDROP INDEX %s.%s" % (
             self.preparer.quote_identifier(index.table.name),
-            self.preparer.quote(self._validate_identifier(index.name, False), index.quote)
+            self.preparer.quote(
+                    self._validate_identifier(index.name, False), index.quote)
             )
 
 class SybaseIdentifierPreparer(compiler.IdentifierPreparer):
@@ -371,7 +382,8 @@ class SybaseDialect(default.DefaultDialect):
 
     def _get_default_schema_name(self, connection):
         return connection.scalar(
-                     text("SELECT user_name() as user_name", typemap={'user_name':Unicode})
+                     text("SELECT user_name() as user_name",
+                     typemap={'user_name':Unicode})
              )
 
     def initialize(self, connection):
diff --git a/lib/sqlalchemy/dialects/sybase/pyodbc.py b/lib/sqlalchemy/dialects/sybase/pyodbc.py
index e34f2605c..1d955a7d9 100644
--- a/lib/sqlalchemy/dialects/sybase/pyodbc.py
+++ b/lib/sqlalchemy/dialects/sybase/pyodbc.py
@@ -28,7 +28,8 @@ Currently *not* supported are::
     
 """
 
-from sqlalchemy.dialects.sybase.base import SybaseDialect, SybaseExecutionContext
+from sqlalchemy.dialects.sybase.base import SybaseDialect,\
+                                            SybaseExecutionContext
 from sqlalchemy.connectors.pyodbc import PyODBCConnector
 import decimal
 from sqlalchemy import types as sqltypes, util, processors
@@ -43,7 +44,8 @@ class _SybNumeric_pyodbc(sqltypes.Numeric):
     """
 
     def bind_processor(self, dialect):
-        super_process = super(_SybNumeric_pyodbc, self).bind_processor(dialect)
+        super_process = super(_SybNumeric_pyodbc,self).\
+                                    bind_processor(dialect)
 
         def process(value):
             if self.asdecimal and \
diff --git a/lib/sqlalchemy/dialects/sybase/pysybase.py b/lib/sqlalchemy/dialects/sybase/pysybase.py
index ee1938250..4803761c4 100644
--- a/lib/sqlalchemy/dialects/sybase/pysybase.py
+++ b/lib/sqlalchemy/dialects/sybase/pysybase.py
@@ -23,7 +23,7 @@ kind at this time.
 
 from sqlalchemy import types as sqltypes, processors
 from sqlalchemy.dialects.sybase.base import SybaseDialect, \
-                                        SybaseExecutionContext, SybaseSQLCompiler
+                            SybaseExecutionContext, SybaseSQLCompiler
 
 
 class _SybNumeric(sqltypes.Numeric):
@@ -83,11 +83,13 @@ class SybaseDialect_pysybase(SybaseDialect):
 
     def _get_server_version_info(self, connection):
        vers = connection.scalar("select @@version_number")
-       # i.e. 15500, 15000, 12500 == (15, 5, 0, 0), (15, 0, 0, 0), (12, 5, 0, 0)
+       # i.e. 15500, 15000, 12500 == (15, 5, 0, 0), (15, 0, 0, 0), 
+       # (12, 5, 0, 0)
        return (vers / 1000, vers % 1000 / 100, vers % 100 / 10, vers % 10)
 
     def is_disconnect(self, e):
-        if isinstance(e, (self.dbapi.OperationalError, self.dbapi.ProgrammingError)):
+        if isinstance(e, (self.dbapi.OperationalError,
+                            self.dbapi.ProgrammingError)):
             msg = str(e)
             return ('Unable to complete network request to host' in msg or
                     'Invalid connection state' in msg or