summaryrefslogtreecommitdiff
path: root/sqla_nose.py
diff options
context:
space:
mode:
Diffstat (limited to 'sqla_nose.py')
-rwxr-xr-xsqla_nose.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/sqla_nose.py b/sqla_nose.py
index 32604f97c..6d76978a4 100755
--- a/sqla_nose.py
+++ b/sqla_nose.py
@@ -3,23 +3,24 @@
nose runner script.
Only use this script if setuptools is not available, i.e. such as
-on Python 3K. Otherwise consult README.unittests for the
+on Python 3K. Otherwise consult README.unittests for the
recommended methods of running tests.
"""
+import sys
+
try:
- import sqlalchemy
+ from sqlalchemy_nose.noseplugin import NoseSQLAlchemy
except ImportError:
from os import path
- import sys
- sys.path.append(path.join(path.dirname(__file__), 'lib'))
+ sys.path.append(path.join(path.dirname(path.abspath(__file__)), 'lib'))
+ from sqlalchemy_nose.noseplugin import NoseSQLAlchemy
import nose
-from sqlalchemy.test.noseplugin import NoseSQLAlchemy
-from sqlalchemy.util import py3k
if __name__ == '__main__':
+ py3k = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0)
if py3k:
# this version breaks verbose output,
# but is the only API that nose3 currently supports