From 63a953e59dbd3389f96c2ab39aa149dc0ba063e4 Mon Sep 17 00:00:00 2001 From: Diana Clarke Date: Tue, 20 Nov 2012 00:03:21 -0500 Subject: [PATCH] just a pep8 pass --- lib/sqlalchemy/dialects/firebird/base.py | 27 +++++---- .../dialects/firebird/kinterbasdb.py | 2 +- lib/sqlalchemy/dialects/informix/base.py | 57 +++++++++---------- lib/sqlalchemy/dialects/mssql/adodbapi.py | 2 +- lib/sqlalchemy/dialects/mssql/base.py | 3 +- lib/sqlalchemy/dialects/mssql/mxodbc.py | 1 - lib/sqlalchemy/dialects/mssql/pymssql.py | 4 +- lib/sqlalchemy/dialects/mssql/pyodbc.py | 4 +- lib/sqlalchemy/dialects/mysql/base.py | 11 +--- .../dialects/mysql/mysqlconnector.py | 2 +- lib/sqlalchemy/dialects/mysql/oursql.py | 2 - lib/sqlalchemy/dialects/mysql/zxjdbc.py | 2 +- lib/sqlalchemy/dialects/oracle/base.py | 34 +++++------ lib/sqlalchemy/dialects/oracle/cx_oracle.py | 3 +- 14 files changed, 68 insertions(+), 86 deletions(-) diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py index d40ca30dff..d9cdf72db9 100644 --- a/lib/sqlalchemy/dialects/firebird/base.py +++ b/lib/sqlalchemy/dialects/firebird/base.py @@ -213,7 +213,6 @@ class FBTypeCompiler(compiler.GenericTypeCompiler): return self._extend_string(type_, basic) - class FBCompiler(sql.compiler.SQLCompiler): """Firebird specific idiosyncrasies""" @@ -518,7 +517,7 @@ class FBDialect(default.DefaultDialect): # get primary key fields c = connection.execute(keyqry, ["PRIMARY KEY", tablename]) pkfields = [self.normalize_name(r['fname']) for r in c.fetchall()] - return {'constrained_columns':pkfields, 'name':None} + return {'constrained_columns': pkfields, 'name': None} @reflection.cache def get_column_sequence(self, connection, @@ -626,11 +625,11 @@ class FBDialect(default.DefaultDialect): # Redundant defvalue = None col_d = { - 'name' : name, - 'type' : coltype, - 'nullable' : not bool(row['null_flag']), - 'default' : defvalue, - 'autoincrement':defvalue is None + 'name': name, + 'type': coltype, + 'nullable': not bool(row['null_flag']), + 'default': defvalue, + 'autoincrement': defvalue is None } if orig_colname.lower() == orig_colname: @@ -638,7 +637,7 @@ class FBDialect(default.DefaultDialect): # if the PK is a single field, try to see if its linked to # a sequence thru a trigger - if len(pkey_cols)==1 and name==pkey_cols[0]: + if len(pkey_cols) == 1 and name == pkey_cols[0]: seq_d = self.get_column_sequence(connection, tablename, name) if seq_d is not None: col_d['sequence'] = seq_d @@ -668,12 +667,12 @@ class FBDialect(default.DefaultDialect): tablename = self.denormalize_name(table_name) c = connection.execute(fkqry, ["FOREIGN KEY", tablename]) - fks = util.defaultdict(lambda:{ - 'name' : None, - 'constrained_columns' : [], - 'referred_schema' : None, - 'referred_table' : None, - 'referred_columns' : [] + fks = util.defaultdict(lambda: { + 'name': None, + 'constrained_columns': [], + 'referred_schema': None, + 'referred_table': None, + 'referred_columns': [] }) for row in c: diff --git a/lib/sqlalchemy/dialects/firebird/kinterbasdb.py b/lib/sqlalchemy/dialects/firebird/kinterbasdb.py index cae9f4e3e8..f6c533cfc3 100644 --- a/lib/sqlalchemy/dialects/firebird/kinterbasdb.py +++ b/lib/sqlalchemy/dialects/firebird/kinterbasdb.py @@ -85,7 +85,7 @@ class FBDialect_kinterbasdb(FBDialect): colspecs = util.update_copy( FBDialect.colspecs, { - sqltypes.Numeric:_FBNumeric_kinterbasdb, + sqltypes.Numeric: _FBNumeric_kinterbasdb, } ) diff --git a/lib/sqlalchemy/dialects/informix/base.py b/lib/sqlalchemy/dialects/informix/base.py index ee0d3a8312..0b82519a6f 100644 --- a/lib/sqlalchemy/dialects/informix/base.py +++ b/lib/sqlalchemy/dialects/informix/base.py @@ -182,26 +182,26 @@ colspecs = { ischema_names = { - 0 : sqltypes.CHAR, # CHAR - 1 : sqltypes.SMALLINT, # SMALLINT - 2 : sqltypes.INTEGER, # INT - 3 : sqltypes.FLOAT, # Float - 3 : sqltypes.Float, # SmallFloat - 5 : sqltypes.DECIMAL, # DECIMAL - 6 : sqltypes.Integer, # Serial - 7 : sqltypes.DATE, # DATE - 8 : sqltypes.Numeric, # MONEY - 10 : sqltypes.DATETIME, # DATETIME - 11 : sqltypes.LargeBinary, # BYTE - 12 : sqltypes.TEXT, # TEXT - 13 : sqltypes.VARCHAR, # VARCHAR - 15 : sqltypes.NCHAR, # NCHAR - 16 : sqltypes.NVARCHAR, # NVARCHAR - 17 : sqltypes.Integer, # INT8 - 18 : sqltypes.Integer, # Serial8 - 43 : sqltypes.String, # LVARCHAR - -1 : sqltypes.BLOB, # BLOB - -1 : sqltypes.CLOB, # CLOB + 0: sqltypes.CHAR, # CHAR + 1: sqltypes.SMALLINT, # SMALLINT + 2: sqltypes.INTEGER, # INT + 3: sqltypes.FLOAT, # Float + 3: sqltypes.Float, # SmallFloat + 5: sqltypes.DECIMAL, # DECIMAL + 6: sqltypes.Integer, # Serial + 7: sqltypes.DATE, # DATE + 8: sqltypes.Numeric, # MONEY + 10: sqltypes.DATETIME, # DATETIME + 11: sqltypes.LargeBinary, # BYTE + 12: sqltypes.TEXT, # TEXT + 13: sqltypes.VARCHAR, # VARCHAR + 15: sqltypes.NCHAR, # NCHAR + 16: sqltypes.NVARCHAR, # NVARCHAR + 17: sqltypes.Integer, # INT8 + 18: sqltypes.Integer, # Serial8 + 43: sqltypes.String, # LVARCHAR + -1: sqltypes.BLOB, # BLOB + -1: sqltypes.CLOB, # CLOB } @@ -494,7 +494,6 @@ class InformixDialect(default.DefaultDialect): t8.idxname and t7.tabid = t5.ptabid""", table_name, schema_sel) - def fkey_rec(): return { 'name' : None, @@ -543,15 +542,15 @@ class InformixDialect(default.DefaultDialect): colpositions = set() for row in data: - colpos = set([getattr(row, 'part%d' % x) for x in range(1,16)]) + colpos = set([getattr(row, 'part%d' % x) for x in range(1, 16)]) colpositions |= colpos if not len(colpositions): - return {'constrained_columns':[], 'name':None} + return {'constrained_columns': [], 'name': None} # Select the column names using the columnpositions # TODO: Maybe cache a bit of those col infos (eg select all colnames for one table) - place_holder = ','.join('?'*len(colpositions)) + place_holder = ','.join('?' * len(colpositions)) c = connection.execute( """select t1.colname from syscolumns as t1, systables as t2 @@ -560,8 +559,8 @@ class InformixDialect(default.DefaultDialect): table_name, *colpositions ).fetchall() - cols = reduce(lambda x,y: list(x)+list(y), c, []) - return {'constrained_columns':cols, 'name':None} + cols = reduce(lambda x, y: list(x) + list(y), c, []) + return {'constrained_columns': cols, 'name': None} @reflection.cache def get_indexes(self, connection, table_name, schema, **kw): @@ -574,9 +573,9 @@ class InformixDialect(default.DefaultDialect): indexes = [] for row in c.fetchall(): - colnames = [getattr(row, 'part%d' % x) for x in range(1,16)] + colnames = [getattr(row, 'part%d' % x) for x in range(1, 16)] colnames = [x for x in colnames if x] - place_holder = ','.join('?'*len(colnames)) + place_holder = ','.join('?' * len(colnames)) c = connection.execute( """select t1.colname from syscolumns as t1, systables as t2 @@ -584,7 +583,7 @@ class InformixDialect(default.DefaultDialect): t1.colno in (%s)""" % place_holder, table_name, *colnames ).fetchall() - c = reduce(lambda x,y: list(x)+list(y), c, []) + c = reduce(lambda x, y: list(x) + list(y), c, []) indexes.append({ 'name': row.idxname, 'unique': row.idxtype.lower() == 'u', diff --git a/lib/sqlalchemy/dialects/mssql/adodbapi.py b/lib/sqlalchemy/dialects/mssql/adodbapi.py index 247c1ce8fe..294402c06d 100644 --- a/lib/sqlalchemy/dialects/mssql/adodbapi.py +++ b/lib/sqlalchemy/dialects/mssql/adodbapi.py @@ -50,7 +50,7 @@ class MSDialect_adodbapi(MSDialect): colspecs = util.update_copy( MSDialect.colspecs, { - sqltypes.DateTime:MSDateTime_adodbapi + sqltypes.DateTime: MSDateTime_adodbapi } ) diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 8292d08f16..10878c0f52 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -1393,7 +1393,7 @@ class MSDialect(default.DefaultDialect): 'type' : coltype, 'nullable' : nullable, 'default' : default, - 'autoincrement':False, + 'autoincrement': False, } cols.append(cdict) # autoincrement and identity @@ -1480,7 +1480,6 @@ class MSDialect(default.DefaultDialect): RR.c.constraint_name, R.c.ordinal_position]) - # group rows by constraint ID, to handle multi-column FKs fkeys = [] fknm, scols, rcols = (None, [], []) diff --git a/lib/sqlalchemy/dialects/mssql/mxodbc.py b/lib/sqlalchemy/dialects/mssql/mxodbc.py index ccafe0efe0..3c8bb307de 100644 --- a/lib/sqlalchemy/dialects/mssql/mxodbc.py +++ b/lib/sqlalchemy/dialects/mssql/mxodbc.py @@ -104,7 +104,6 @@ class MSDialect_mxodbc(MxODBCConnector, MSDialect): sqltypes.Time : _MSTime_mxodbc, } - def __init__(self, description_encoding=None, **params): super(MSDialect_mxodbc, self).__init__(**params) self.description_encoding = description_encoding diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py index b51e88e36b..71aa7c1883 100644 --- a/lib/sqlalchemy/dialects/mssql/pymssql.py +++ b/lib/sqlalchemy/dialects/mssql/pymssql.py @@ -44,8 +44,8 @@ class MSDialect_pymssql(MSDialect): colspecs = util.update_copy( MSDialect.colspecs, { - sqltypes.Numeric:_MSNumeric_pymssql, - sqltypes.Float:sqltypes.Float, + sqltypes.Numeric: _MSNumeric_pymssql, + sqltypes.Float: sqltypes.Float, } ) @classmethod diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py index 8264347dff..7715865244 100644 --- a/lib/sqlalchemy/dialects/mssql/pyodbc.py +++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py @@ -164,7 +164,7 @@ class _MSNumeric_pyodbc(sqltypes.Numeric): result = "%s%s%s" % ( (value < 0 and '-' or ''), "".join([str(s) for s in _int]), - "0" * (value.adjusted() - (len(_int)-1))) + "0" * (value.adjusted() - (len(_int) - 1))) else: if (len(_int) - 1) > value.adjusted(): result = "%s%s.%s" % ( @@ -238,7 +238,7 @@ class MSDialect_pyodbc(PyODBCConnector, MSDialect): colspecs = util.update_copy( MSDialect.colspecs, { - sqltypes.Numeric:_MSNumeric_pyodbc + sqltypes.Numeric: _MSNumeric_pyodbc } ) diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index fa874ac5b3..f8981fc964 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1469,7 +1469,6 @@ class MySQLDDLCompiler(compiler.DDLCompiler): return constraint_string - def get_column_specification(self, column, **kw): """Builds column DDL.""" @@ -1529,7 +1528,6 @@ class MySQLDDLCompiler(compiler.DDLCompiler): table_opts.append(joiner.join((opt, arg))) return ' '.join(table_opts) - def visit_create_index(self, create): index = create.element preparer = self.preparer @@ -2018,7 +2016,6 @@ class MySQLDialect(default.DefaultDialect): def _get_default_schema_name(self, connection): return connection.execute('SELECT DATABASE()').scalar() - def has_table(self, connection, table_name, schema=None): # SHOW TABLE STATUS LIKE and SHOW TABLES LIKE do not function properly # on macosx (and maybe win?) with multibyte table names. @@ -2030,7 +2027,6 @@ class MySQLDialect(default.DefaultDialect): # full_name = self.identifier_preparer.format_table(table, # use_schema=True) - full_name = '.'.join(self.identifier_preparer._quote_free_identifiers( schema, table_name)) @@ -2122,8 +2118,8 @@ class MySQLDialect(default.DefaultDialect): if key['type'] == 'PRIMARY': # There can be only one. cols = [s[0] for s in key['columns']] - return {'constrained_columns':cols, 'name':None} - return {'constrained_columns':[], 'name':None} + return {'constrained_columns': cols, 'name': None} + return {'constrained_columns': [], 'name': None} @reflection.cache def get_foreign_keys(self, connection, table_name, schema=None, **kw): @@ -2639,7 +2635,6 @@ class MySQLTableDefinitionParser(object): # 123 or 123,456 self._re_csv_int = _re_compile(r'\d+') - # `colname` [type opts] # (NOT NULL | NULL) # DEFAULT ('value' | CURRENT_TIMESTAMP...) @@ -2748,7 +2743,7 @@ class MySQLTableDefinitionParser(object): r"'(?P(?:[^']|'')*?)'(?!')" % (re.escape(directive), self._optional_equals)) self._pr_options.append( - _pr_compile(regex, lambda v: v.replace("\\\\","\\").replace("''", "'"))) + _pr_compile(regex, lambda v: v.replace("\\\\", "\\").replace("''", "'"))) def _add_option_word(self, directive): regex = (r'(?P%s)%s' diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py index cfaabb0458..45dfb1f546 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py +++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py @@ -111,7 +111,7 @@ class MySQLDialect_mysqlconnector(MySQLDialect): def is_disconnect(self, e, connection, cursor): errnos = (2006, 2013, 2014, 2045, 2055, 2048) - exceptions = (self.dbapi.OperationalError,self.dbapi.InterfaceError) + exceptions = (self.dbapi.OperationalError, self.dbapi.InterfaceError) if isinstance(e, exceptions): return e.errno in errnos else: diff --git a/lib/sqlalchemy/dialects/mysql/oursql.py b/lib/sqlalchemy/dialects/mysql/oursql.py index 25c0a7e84d..8e4fe23835 100644 --- a/lib/sqlalchemy/dialects/mysql/oursql.py +++ b/lib/sqlalchemy/dialects/mysql/oursql.py @@ -39,7 +39,6 @@ from .base import (BIT, MySQLDialect, MySQLExecutionContext) from ... import types as sqltypes, util - class _oursqlBIT(BIT): def result_processor(self, dialect, coltype): """oursql already converts mysql bits, so.""" @@ -141,7 +140,6 @@ class MySQLDialect_oursql(MySQLDialect): **kw ) - def get_columns(self, connection, table_name, schema=None, **kw): return MySQLDialect.get_columns(self, connection.connect().\ diff --git a/lib/sqlalchemy/dialects/mysql/zxjdbc.py b/lib/sqlalchemy/dialects/mysql/zxjdbc.py index 743eac7706..cda33c8c96 100644 --- a/lib/sqlalchemy/dialects/mysql/zxjdbc.py +++ b/lib/sqlalchemy/dialects/mysql/zxjdbc.py @@ -97,7 +97,7 @@ class MySQLDialect_zxjdbc(ZxJDBCConnector, MySQLDialect): if c: return int(c) - def _get_server_version_info(self,connection): + def _get_server_version_info(self, connection): dbapi_con = connection.connection version = [] r = re.compile('[.\-]') diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index 5956a04b67..1daea3cefb 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -260,7 +260,6 @@ class ROWID(sqltypes.TypeEngine): __visit_name__ = 'ROWID' - class _OracleBoolean(sqltypes.Boolean): def get_dbapi_type(self, dbapi): return dbapi.NUMBER @@ -343,9 +342,11 @@ class OracleTypeCompiler(compiler.GenericTypeCompiler): if precision is None: return name elif scale is None: - return "%(name)s(%(precision)s)" % {'name':name,'precision': precision} + n = "%(name)s(%(precision)s)" + return n % {'name': name, 'precision': precision} else: - return "%(name)s(%(precision)s, %(scale)s)" % {'name':name,'precision': precision, 'scale' : scale} + n = "%(name)s(%(precision)s, %(scale)s)" + return n % {'name': name, 'precision': precision, 'scale': scale} def visit_string(self, type_): return self.visit_VARCHAR2(type_) @@ -362,12 +363,11 @@ class OracleTypeCompiler(compiler.GenericTypeCompiler): def _visit_varchar(self, type_, n, num): if not n and self.dialect._supports_char_length: - return "VARCHAR%(two)s(%(length)s CHAR)" % { - 'length' : type_.length, - 'two':num} + varchar = "VARCHAR%(two)s(%(length)s CHAR)" + return varchar % {'length': type_.length, 'two': num} else: - return "%(n)sVARCHAR%(two)s(%(length)s)" % {'length' : type_.length, - 'two':num, 'n':n} + varchar = "%(n)sVARCHAR%(two)s(%(length)s)" + return varchar % {'length': type_.length, 'two': num, 'n': n} def visit_text(self, type_): return self.visit_CLOB(type_) @@ -469,7 +469,7 @@ class OracleCompiler(compiler.SQLCompiler): elif binary.right.table is join.right: binary.right = _OuterJoinColumn(binary.right) clauses.append(visitors.cloned_traverse(join.onclause, {}, - {'binary':visit_binary})) + {'binary': visit_binary})) else: clauses.append(join.onclause) @@ -866,7 +866,6 @@ class OracleDialect(default.DefaultDialect): cursor = connection.execute(s, owner=schema) return [self.normalize_name(row[0]) for row in cursor] - @reflection.cache def get_view_names(self, connection, schema=None, **kw): schema = self.denormalize_name(schema or self.default_schema_name) @@ -904,12 +903,12 @@ class OracleDialect(default.DefaultDialect): "SELECT column_name, data_type, %(char_length_col)s, data_precision, data_scale, " "nullable, data_default FROM ALL_TAB_COLUMNS%(dblink)s " "WHERE table_name = :table_name AND owner = :owner " - "ORDER BY column_id" % {'dblink': dblink, 'char_length_col':char_length_col}), + "ORDER BY column_id" % {'dblink': dblink, 'char_length_col': char_length_col}), table_name=table_name, owner=schema) for row in c: (colname, orig_colname, coltype, length, precision, scale, nullable, default) = \ - (self.normalize_name(row[0]), row[0], row[1], row[2], row[3], row[4], row[5]=='Y', row[6]) + (self.normalize_name(row[0]), row[0], row[1], row[2], row[3], row[4], row[5] == 'Y', row[6]) if coltype == 'NUMBER' : coltype = NUMBER(precision, scale) @@ -931,7 +930,7 @@ class OracleDialect(default.DefaultDialect): 'type': coltype, 'nullable': nullable, 'default': default, - 'autoincrement':default is None + 'autoincrement': default is None } if orig_colname.lower() == orig_colname: cdict['quote'] = True @@ -943,7 +942,6 @@ class OracleDialect(default.DefaultDialect): def get_indexes(self, connection, table_name, schema=None, resolve_synonyms=False, dblink='', **kw): - info_cache = kw.get('info_cache') (table_name, schema, dblink, synonym) = \ self._prepare_reflection_args(connection, table_name, schema, @@ -1054,7 +1052,7 @@ class OracleDialect(default.DefaultDialect): if constraint_name is None: constraint_name = self.normalize_name(cons_name) pkeys.append(local_column) - return {'constrained_columns':pkeys, 'name':constraint_name} + return {'constrained_columns': pkeys, 'name': constraint_name} @reflection.cache def get_foreign_keys(self, connection, table_name, schema=None, **kw): @@ -1103,7 +1101,7 @@ class OracleDialect(default.DefaultDialect): util.warn( ("Got 'None' querying 'table_name' from " "all_cons_columns%(dblink)s - does the user have " - "proper rights to the table?") % {'dblink':dblink}) + "proper rights to the table?") % {'dblink': dblink}) continue rec = fkeys[cons_name] @@ -1153,12 +1151,8 @@ class OracleDialect(default.DefaultDialect): return None - class _OuterJoinColumn(sql.ClauseElement): __visit_name__ = 'outer_join_column' def __init__(self, column): self.column = column - - - diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 50c8550ed5..e7b182c663 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -504,7 +504,6 @@ class OracleDialect_cx_oracle(OracleDialect): oracle.ROWID: _OracleRowid, } - execute_sequence_format = list def __init__(self, @@ -585,7 +584,7 @@ class OracleDialect_cx_oracle(OracleDialect): # expect encoded strings or unicodes, etc. self.dbapi_type_map = { self.dbapi.CLOB: oracle.CLOB(), - self.dbapi.NCLOB:oracle.NCLOB(), + self.dbapi.NCLOB: oracle.NCLOB(), self.dbapi.BLOB: oracle.BLOB(), self.dbapi.BINARY: oracle.RAW(), } -- 2.47.2