From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 11 Dec 2008 18:43:05 +0000 (+0000)
Subject: fix circular import
X-Git-Tag: rel_0_5_0~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b0c456abd7756fa50700b7332f2cbe1d5aef620;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix circular import
---

diff --git a/test/testlib/assertsql.py b/test/testlib/assertsql.py
index 33a7e5b64f..1cafd041a8 100644
--- a/test/testlib/assertsql.py
+++ b/test/testlib/assertsql.py
@@ -1,8 +1,9 @@
+
 from sqlalchemy.interfaces import ConnectionProxy
-import re
 from sqlalchemy.engine.default import DefaultDialect
 from sqlalchemy.engine.base import Connection
 import testing
+import re
 
 class AssertRule(object):
     def process_execute(self, clauseelement, *multiparams, **params):
diff --git a/test/testlib/testing.py b/test/testlib/testing.py
index a7ac138491..0bf083bbd0 100644
--- a/test/testlib/testing.py
+++ b/test/testlib/testing.py
@@ -13,7 +13,6 @@ from cStringIO import StringIO
 
 import testlib.config as config
 from testlib.compat import _function_named
-from testlib import assertsql
 
 # Delayed imports
 MetaData = None
@@ -725,6 +724,7 @@ class AssertsExecutionResults(object):
         return True
 
     def assert_sql_execution(self, db, callable_, *rules):
+        from testlib import assertsql
         assertsql.asserter.add_rules(rules)
         try:
             callable_()
@@ -733,6 +733,8 @@ class AssertsExecutionResults(object):
             assertsql.asserter.clear_rules()
             
     def assert_sql(self, db, callable_, list_, with_sequences=None):
+        from testlib import assertsql
+
         if with_sequences is not None and config.db.name in ('firebird', 'oracle', 'postgres'):
             rules = with_sequences
         else:
@@ -751,6 +753,7 @@ class AssertsExecutionResults(object):
         self.assert_sql_execution(db, callable_, *newrules)
 
     def assert_sql_count(self, db, callable_, count):
+        from testlib import assertsql
         self.assert_sql_execution(db, callable_, assertsql.CountStatements(count))