diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-29 14:10:28 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-29 14:10:28 -0400 |
commit | 559ba7a2aa142df408b9f835dd6e64d321a34dca (patch) | |
tree | dafbe1b35b32833d1830df69badb5aed07998fc2 /lib/sqlalchemy/sql | |
parent | 74a8723df35fb35869fe95af5128ab6acd527a79 (diff) | |
download | sqlalchemy-559ba7a2aa142df408b9f835dd6e64d321a34dca.tar.gz |
remove a few superfluous imports
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r-- | lib/sqlalchemy/sql/expression.py | 21 | ||||
-rw-r--r-- | lib/sqlalchemy/sql/util.py | 1 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 70e26cfcc..6dd9d8baf 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -34,8 +34,8 @@ from sqlalchemy.sql import operators from sqlalchemy.sql.visitors import Visitable, cloned_traverse import operator -functions, schema, sql_util, sqltypes = None, None, None, None -DefaultDialect, ClauseAdapter, Annotated = None, None, None +functions, sql_util, sqltypes = None, None, None +DefaultDialect = None __all__ = [ 'Alias', 'ClauseElement', @@ -1075,10 +1075,10 @@ class ClauseElement(Visitable): dictionary. """ - global Annotated - if Annotated is None: - from sqlalchemy.sql.util import Annotated - return Annotated(self, values) + global sql_util + if sql_util is None: + from sqlalchemy.sql import util as sql_util + return sql_util.Annotated(self, values) def _deannotate(self): """return a copy of this ClauseElement with an empty annotations @@ -1973,10 +1973,11 @@ class FromClause(Selectable): object, returning a copy of this :class:`FromClause`. """ - global ClauseAdapter - if ClauseAdapter is None: - from sqlalchemy.sql.util import ClauseAdapter - return ClauseAdapter(alias).traverse(self) + + global sql_util + if sql_util is None: + from sqlalchemy.sql import util as sql_util + return sql_util.ClauseAdapter(alias).traverse(self) def correspond_on_equivalents(self, column, equivalents): """Return corresponding_column for the given column, or if None diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index dda5d2d28..b81906396 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -288,7 +288,6 @@ class Annotated(object): # so that the resulting objects are pickleable. annotated_classes = {} -from sqlalchemy.sql import expression for cls in expression.__dict__.values() + [schema.Column, schema.Table]: if isinstance(cls, type) and issubclass(cls, expression.ClauseElement): exec "class Annotated%s(Annotated, cls):\n" \ |