From: Mike Bayer Date: Fri, 30 Jan 2009 21:22:19 +0000 (+0000) Subject: some lists to iterators X-Git-Tag: rel_0_6_6~295 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c1ed684dc9bacfdb56ea723f6f4418fec6553da;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git some lists to iterators --- diff --git a/lib/sqlalchemy/dialects/informix/informixdb.py b/lib/sqlalchemy/dialects/informix/informixdb.py index ddfd597065..68c4feebbe 100644 --- a/lib/sqlalchemy/dialects/informix/informixdb.py +++ b/lib/sqlalchemy/dialects/informix/informixdb.py @@ -53,8 +53,7 @@ class Informix_informixdb(InformixDialect): @classmethod def dbapi(cls): - import informixdb - return informixdb + return __import__('informixdb') def create_connect_args(self, url): if url.host: diff --git a/lib/sqlalchemy/dialects/sybase/base.py b/lib/sqlalchemy/dialects/sybase/base.py index 300edebf90..16b739ae96 100644 --- a/lib/sqlalchemy/dialects/sybase/base.py +++ b/lib/sqlalchemy/dialects/sybase/base.py @@ -360,7 +360,6 @@ class SybaseDialect(default.DefaultDialect): c = connection.execute(s) row = c.fetchone() - print "has_table: " + tablename + ": " + str(bool(row is not None)) return row is not None def reflecttable(self, connection, table, include_columns): @@ -444,7 +443,7 @@ class SybaseDialect(default.DefaultDialect): else: foreignKeys[primary_table][0].append('%s'%(foreign_column)) foreignKeys[primary_table][1].append('%s.%s'%(primary_table, primary_column)) - for primary_table in foreignKeys.keys(): + for primary_table in foreignKeys.iterkeys(): #table.append_constraint(schema.ForeignKeyConstraint(['%s.%s'%(foreign_table, foreign_column)], ['%s.%s'%(primary_table,primary_column)])) table.append_constraint(schema.ForeignKeyConstraint(foreignKeys[primary_table][0], foreignKeys[primary_table][1], link_to_name=True)) diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index b136622704..b719219a5d 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -71,7 +71,8 @@ class DefaultDialect(base.Dialect): self.type_compiler = self.type_compiler(self) if label_length and label_length > self.max_identifier_length: - raise exc.ArgumentError("Label length of %d is greater than this dialect's maximum identifier length of %d" % (label_length, self.max_identifier_length)) + raise exc.ArgumentError("Label length of %d is greater than this dialect's" + " maximum identifier length of %d" % (label_length, self.max_identifier_length)) self.label_length = label_length if not hasattr(self, 'description_encoding'): diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py index 43642728b8..0f8b31d0fd 100644 --- a/lib/sqlalchemy/orm/identity.py +++ b/lib/sqlalchemy/orm/identity.py @@ -161,7 +161,7 @@ class WeakInstanceDict(IdentityMap): class StrongInstanceDict(IdentityMap): def all_states(self): - return [attributes.instance_state(o) for o in self.values()] + return [attributes.instance_state(o) for o in self.itervalues()] def contains_state(self, state): return state.key in self and attributes.instance_state(self[state.key]) is state diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index e85ecaa58c..de7f66882b 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1352,7 +1352,7 @@ class Query(object): session._finalize_loaded(context.progress) - for ii, attrs in context.partials.items(): + for ii, attrs in context.partials.iteritems(): ii.commit(attrs) for row in rows: @@ -1648,7 +1648,7 @@ class Query(object): eval_condition = evaluator_compiler.process(self.whereclause or expression._Null) value_evaluators = {} - for key,value in values.items(): + for key,value in values.iteritems(): key = expression._column_as_key(key) value_evaluators[key] = evaluator_compiler.process(expression._literal_as_binds(value)) except evaluator.UnevaluatableError: diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 5559784c76..c8d90a5c1b 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -169,7 +169,7 @@ class _ScopedExt(MapperExtension): def _default__init__(ext, mapper): def __init__(self, **kwargs): - for key, value in kwargs.items(): + for key, value in kwargs.iteritems(): if ext.validate: if not mapper.get_property(key, resolve_synonyms=False, raiseerr=False): diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py index 2d4e223c45..aca4663774 100644 --- a/lib/sqlalchemy/pool.py +++ b/lib/sqlalchemy/pool.py @@ -51,7 +51,7 @@ def clear_managers(): All pools and connections are disposed. """ - for manager in proxies.values(): + for manager in proxies.itervalues(): manager.close() proxies.clear() diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index c2fb5ee5a6..363b433d5c 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -1315,7 +1315,7 @@ class PrimaryKeyConstraint(Constraint): if kwargs: raise exc.ArgumentError( 'Unknown PrimaryKeyConstraint argument(s): %s' % - ', '.join(repr(x) for x in kwargs.keys())) + ', '.join(repr(x) for x in kwargs.iterkeys())) super(PrimaryKeyConstraint, self).__init__(**constraint_args) self.__colnames = list(columns) @@ -1382,7 +1382,7 @@ class UniqueConstraint(Constraint): if kwargs: raise exc.ArgumentError( 'Unknown UniqueConstraint argument(s): %s' % - ', '.join(repr(x) for x in kwargs.keys())) + ', '.join(repr(x) for x in kwargs.iterkeys())) super(UniqueConstraint, self).__init__(**constraint_args) self.__colnames = list(columns) @@ -1622,9 +1622,9 @@ class MetaData(SchemaItem): from sqlalchemy.sql.util import sort_tables if tables is None: - tables = self.tables.values() + tables = self.tables.itervalues() else: - tables = set(tables).intersection(self.tables.values()) + tables = set(tables).intersection(self.tables.itervalues()) ret = sort_tables(tables) if reverse: ret = reversed(ret) @@ -1636,7 +1636,7 @@ class MetaData(SchemaItem): dependency. """ from sqlalchemy.sql.util import sort_tables - return sort_tables(self.tables.values()) + return sort_tables(self.tables.itervalues()) def reflect(self, bind=None, schema=None, only=None): """Load all available table definitions from the database. @@ -1682,7 +1682,7 @@ class MetaData(SchemaItem): available = util.OrderedSet(bind.engine.table_names(schema, connection=conn)) - current = set(self.tables.keys()) + current = set(self.tables.iterkeys()) if only is None: load = [name for name in available if name not in current] @@ -1882,7 +1882,7 @@ class ThreadLocalMetaData(MetaData): def dispose(self): """Dispose all bound engines, in all thread contexts.""" - for e in self.__engines.values(): + for e in self.__engines.itervalues(): if hasattr(e, 'dispose'): e.dispose() diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py index aaea145fd3..3f73824534 100644 --- a/lib/sqlalchemy/types.py +++ b/lib/sqlalchemy/types.py @@ -1008,7 +1008,9 @@ NULLTYPE = NullType() # type which usually resolves to TEXT/CLOB type_map = { str : VARCHAR, + # Py2K unicode : NCHAR, + # end Py2K int : Integer, float : Numeric, bool: Boolean,