summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-08-14 03:34:38 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-08-14 03:34:38 +0000
commit6c6cd47c024c5ea2cada04534aca818f95b8ea8c (patch)
treebbdb86a8eddc32cb2548a309146106e4d2026b62 /test
parentb9ed823528ef88fb0dc64120e1e501306f4c3768 (diff)
downloadsqlalchemy-6c6cd47c024c5ea2cada04534aca818f95b8ea8c.tar.gz
- fixed endless loop
- fixed perf imports in masseagerload
Diffstat (limited to 'test')
-rw-r--r--test/perf/masseagerload.py1
-rw-r--r--test/testlib/__init__.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/test/perf/masseagerload.py b/test/perf/masseagerload.py
index f1c0f292b..ad438c1fa 100644
--- a/test/perf/masseagerload.py
+++ b/test/perf/masseagerload.py
@@ -1,5 +1,4 @@
import testbase
-import hotshot, hotshot.stats
from sqlalchemy import *
from sqlalchemy.orm import *
from testlib import *
diff --git a/test/testlib/__init__.py b/test/testlib/__init__.py
index bfc2ba04b..046f8f9b4 100644
--- a/test/testlib/__init__.py
+++ b/test/testlib/__init__.py
@@ -7,10 +7,10 @@ import testlib.config
from testlib.schema import Table, Column
import testlib.testing as testing
from testlib.testing import PersistTest, AssertMixin, ORMTest, SQLCompileTest
-import testlib.profiling
+import testlib.profiling as profiling
import testlib.engines
__all__ = ('testing',
'Table', 'Column',
- 'PersistTest', 'AssertMixin', 'ORMTest', 'SQLCompileTest')
+ 'PersistTest', 'AssertMixin', 'ORMTest', 'SQLCompileTest', 'profiling')