summaryrefslogtreecommitdiff
path: root/sqla_nose.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-11-13 11:26:05 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2010-11-13 11:26:05 -0500
commit4c61875aa19ee622d0b90a9c4028ca6666e2aa44 (patch)
tree3d15a9467844620c6d9bb9e6457ac2ccd4a60e35 /sqla_nose.py
parent83b534bc9524c152c53b2b39589f7535ad3690a7 (diff)
downloadsqlalchemy-4c61875aa19ee622d0b90a9c4028ca6666e2aa44.tar.gz
- nose3 seems to support "addplugins" now
- add a note about sqla_nose.py
Diffstat (limited to 'sqla_nose.py')
-rwxr-xr-xsqla_nose.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/sqla_nose.py b/sqla_nose.py
index ab329fd3f..302fb5b08 100755
--- a/sqla_nose.py
+++ b/sqla_nose.py
@@ -5,7 +5,6 @@ nose runner script.
This script is a front-end to "nosetests" which doesn't
require that SQLA's testing plugin be installed via setuptools.
-
"""
import sys
@@ -18,13 +17,5 @@ except ImportError:
import nose
-
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
- nose.main(plugins=[NoseSQLAlchemy()])
- else:
- # this is the "correct" API
- nose.main(addplugins=[NoseSQLAlchemy()])
+ nose.main(addplugins=[NoseSQLAlchemy()])