From 05eb3073df25c1add9657b503230ea500514e351 Mon Sep 17 00:00:00 2001 From: Jason Kirtland Date: Mon, 13 Aug 2007 07:09:56 +0000 Subject: [PATCH] Removed unused imports, other import adjustments per pyflakes --- lib/sqlalchemy/databases/access.py | 10 ++++++---- lib/sqlalchemy/engine/__init__.py | 2 +- lib/sqlalchemy/engine/base.py | 2 +- lib/sqlalchemy/engine/default.py | 4 ++-- lib/sqlalchemy/orm/dynamic.py | 6 +++--- lib/sqlalchemy/orm/mapper.py | 3 ++- lib/sqlalchemy/orm/scoping.py | 5 ++--- lib/sqlalchemy/orm/session.py | 7 +++---- lib/sqlalchemy/orm/shard.py | 1 + 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/lib/sqlalchemy/databases/access.py b/lib/sqlalchemy/databases/access.py index ec16d66116..3c06822aef 100644 --- a/lib/sqlalchemy/databases/access.py +++ b/lib/sqlalchemy/databases/access.py @@ -5,8 +5,8 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php -import sys, string, re, datetime, random -from sqlalchemy import sql, engine, schema, ansisql, types, exceptions, pool +import random +from sqlalchemy import sql, schema, ansisql, types, exceptions, pool import sqlalchemy.engine.default as default @@ -149,6 +149,7 @@ class AccessExecutionContext(default.DefaultExecutionContext): super(AccessExecutionContext, self).post_exec() +const, daoEngine = None, None class AccessDialect(ansisql.ANSIDialect): colspecs = { types.Unicode : AcUnicode, @@ -180,8 +181,9 @@ class AccessDialect(ansisql.ANSIDialect): win32com.client.gencache.EnsureModule('{00025E01-0000-0000-C000-000000000046}', 0, 5, 0) global const, daoEngine - const = win32com.client.constants - daoEngine = win32com.client.Dispatch('DAO.DBEngine.36') + if const is None: + const = win32com.client.constants + daoEngine = win32com.client.Dispatch('DAO.DBEngine.36') import pyodbc as module return module diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index 50d03ea91d..2ef163c037 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -45,7 +45,7 @@ The package is represented among several individual modules, including: """ -from sqlalchemy import databases +import sqlalchemy.databases from sqlalchemy.engine.base import * from sqlalchemy.engine import strategies diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 56a07018b5..284be6dfef 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -9,7 +9,7 @@ higher-level statement-construction, connection-management, execution and result contexts.""" from sqlalchemy import exceptions, sql, schema, util, types, logging -import StringIO, sys, re, random +import StringIO, sys class Dialect(object): diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index c71a40fa33..02802452a2 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -6,8 +6,8 @@ """Provide default implementations of per-dialect sqlalchemy.engine classes""" -from sqlalchemy import schema, exceptions, sql, types, util -import sys, re, random +from sqlalchemy import schema, exceptions, sql, util +import re, random from sqlalchemy.engine import base diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py index dee2e28ce9..fe3628df2d 100644 --- a/lib/sqlalchemy/orm/dynamic.py +++ b/lib/sqlalchemy/orm/dynamic.py @@ -4,7 +4,7 @@ a special AttributeHistory on the 'write' side.""" from sqlalchemy import exceptions from sqlalchemy.orm import attributes, object_session from sqlalchemy.orm.query import Query -from sqlalchemy.orm.mapper import has_identity +from sqlalchemy.orm.mapper import has_identity, object_mapper class DynamicCollectionAttribute(attributes.InstrumentedAttribute): def __init__(self, class_, attribute_manager, key, typecallable, target_mapper, **kwargs): @@ -98,9 +98,9 @@ class AppenderQuery(Query): sess = object_session(self.instance) if sess is None: try: - sess = mapper.object_mapper(instance).get_session() + sess = object_mapper(self.instance).get_session() except exceptions.InvalidRequestError: - raise exceptions.InvalidRequestError("Parent instance %s is not bound to a Session, and no contextual session is established; lazy load operation of attribute '%s' cannot proceed" % (instance.__class__, self.key)) + raise exceptions.InvalidRequestError("Parent instance %s is not bound to a Session, and no contextual session is established; lazy load operation of attribute '%s' cannot proceed" % (self.instance.__class__, self.key)) return sess.query(self.attr.target_mapper).with_parent(self.instance) diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 070905d357..85a7f426c0 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -4,13 +4,14 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php +import weakref, warnings, operator from sqlalchemy import sql, util, exceptions, logging from sqlalchemy import sql_util as sqlutil from sqlalchemy.orm import util as mapperutil from sqlalchemy.orm.util import ExtensionCarrier from sqlalchemy.orm import sync from sqlalchemy.orm.interfaces import MapperProperty, EXT_CONTINUE, MapperExtension, SynonymProperty -import weakref, warnings, operator +deferred_load = None __all__ = ['Mapper', 'class_mapper', 'object_mapper', 'mapper_registry'] diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 268246f310..be37ab199d 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -1,7 +1,6 @@ -from sqlalchemy.util import ScopedRegistry, warn_deprecated, to_list -from sqlalchemy.orm import MapperExtension, EXT_CONTINUE +from sqlalchemy.util import ScopedRegistry, to_list +from sqlalchemy.orm import MapperExtension, EXT_CONTINUE, object_session from sqlalchemy.orm.session import Session -from sqlalchemy.orm.mapper import global_extensions from sqlalchemy import exceptions import types diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 48b71c799d..dda1357fff 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -4,13 +4,12 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php -import weakref, types - +import weakref from sqlalchemy import util, exceptions, sql, engine -from sqlalchemy.orm import unitofwork, query, util as mapperutil, MapperExtension, EXT_CONTINUE +from sqlalchemy.orm import unitofwork, query, util as mapperutil from sqlalchemy.orm.mapper import object_mapper as _object_mapper from sqlalchemy.orm.mapper import class_mapper as _class_mapper -from sqlalchemy.orm.mapper import global_extensions + __all__ = ['Session', 'SessionTransaction'] diff --git a/lib/sqlalchemy/orm/shard.py b/lib/sqlalchemy/orm/shard.py index 7f4f3bd210..752806c0ce 100644 --- a/lib/sqlalchemy/orm/shard.py +++ b/lib/sqlalchemy/orm/shard.py @@ -1,5 +1,6 @@ from sqlalchemy.orm.session import Session from sqlalchemy.orm.query import Query +from sqlalchemy import exceptions __all__ = ['ShardedSession', 'ShardedQuery'] -- 2.47.3