From 53aab63b6c24dfdcc249ada5c9d712dc42e5ae40 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 12 Feb 2011 18:00:45 -0500 Subject: - remove some remaining sys.modules shenanigans - The "sqlalchemy.exceptions" alias in sys.modules has been removed. Base SQLA exceptions are available via "from sqlalchemy import exc". The "exceptions" alias for "exc" remains in "sqlalchemy" for now, it's just not patched into sys.modules. --- lib/sqlalchemy/schema.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/sqlalchemy/schema.py') diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 95f0eb8ec..3a4bd90ce 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -34,7 +34,7 @@ from sqlalchemy import event, events sqlutil = util.importlater("sqlalchemy.sql", "util") url = util.importlater("sqlalchemy.engine", "url") - +sqltypes = util.importlater("sqlalchemy", "types") __all__ = ['SchemaItem', 'Table', 'Column', 'ForeignKey', 'Sequence', 'Index', 'ForeignKeyConstraint', 'PrimaryKeyConstraint', 'CheckConstraint', @@ -318,7 +318,7 @@ class Table(SchemaItem, expression.TableClause): def _autoincrement_column(self): for col in self.primary_key: if col.autoincrement and \ - issubclass(col.type._type_affinity, types.Integer) and \ + issubclass(col.type._type_affinity, sqltypes.Integer) and \ not col.foreign_keys and \ isinstance(col.default, (type(None), Sequence)) and \ (col.server_default is None or col.server_default.reflected): @@ -679,9 +679,9 @@ class Column(SchemaItem, expression.ColumnClause): if args: coltype = args[0] - if (isinstance(coltype, types.TypeEngine) or + if (isinstance(coltype, sqltypes.TypeEngine) or (isinstance(coltype, type) and - issubclass(coltype, types.TypeEngine))): + issubclass(coltype, sqltypes.TypeEngine))): if type_ is not None: raise exc.ArgumentError( "May not pass type_ positionally and as a keyword.") @@ -709,7 +709,7 @@ class Column(SchemaItem, expression.ColumnClause): if '_proxies' in kwargs: self.proxies = kwargs.pop('_proxies') # otherwise, add DDL-related events - elif isinstance(self.type, types.SchemaType): + elif isinstance(self.type, sqltypes.SchemaType): self.type._set_parent_with_dispatch(self) if self.default is not None: @@ -1185,7 +1185,7 @@ class ForeignKey(SchemaItem): _column = self._colspec # propagate TypeEngine to parent if it didn't have one - if isinstance(self.parent.type, types.NullType): + if isinstance(self.parent.type, sqltypes.NullType): self.parent.type = _column.type return _column -- cgit v1.2.1