From: Jason Kirtland <jek@discorporate.us>
Date: Tue, 19 Oct 2010 23:44:15 +0000 (-0700)
Subject: Update for new nose plugin location.
X-Git-Tag: rel_0_6_5~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50202a70b4d68c628696904d28ffc58f5f4fb54b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Update for new nose plugin location.
---

diff --git a/sqla_nose.py b/sqla_nose.py
index 32604f97c6..6d76978a40 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