From f8dca6426e58c40f55283c300dd97b0113ab1afa Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Sat, 21 Sep 2013 15:46:47 +0900 Subject: [PATCH] Use unittest2 on Python 2.6 --- pymysql/tests/__init__.py | 5 ++++- pymysql/tests/thirdparty/__init__.py | 5 ++++- pymysql/tests/thirdparty/test_MySQLdb/capabilities.py | 5 ++++- pymysql/tests/thirdparty/test_MySQLdb/dbapi20.py | 6 +++++- .../thirdparty/test_MySQLdb/test_MySQLdb_capabilities.py | 5 ++++- .../thirdparty/test_MySQLdb/test_MySQLdb_nonstandard.py | 5 ++++- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pymysql/tests/__init__.py b/pymysql/tests/__init__.py index 39af4a5..8f3baf0 100644 --- a/pymysql/tests/__init__.py +++ b/pymysql/tests/__init__.py @@ -6,5 +6,8 @@ import sys from pymysql.tests.thirdparty import * if __name__ == "__main__": - import unittest + try: + import unittest2 as unittest + except ImportError: + import unittest unittest.main() diff --git a/pymysql/tests/thirdparty/__init__.py b/pymysql/tests/thirdparty/__init__.py index 7a61347..6d59e11 100644 --- a/pymysql/tests/thirdparty/__init__.py +++ b/pymysql/tests/thirdparty/__init__.py @@ -1,5 +1,8 @@ from .test_MySQLdb import * if __name__ == "__main__": - import unittest + try: + import unittest2 as unittest + except ImportError: + import unittest unittest.main() diff --git a/pymysql/tests/thirdparty/test_MySQLdb/capabilities.py b/pymysql/tests/thirdparty/test_MySQLdb/capabilities.py index 5df0bb7..feaffcd 100644 --- a/pymysql/tests/thirdparty/test_MySQLdb/capabilities.py +++ b/pymysql/tests/thirdparty/test_MySQLdb/capabilities.py @@ -8,7 +8,10 @@ import sys from time import time import array -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest PY2 = sys.version_info[0] == 2 diff --git a/pymysql/tests/thirdparty/test_MySQLdb/dbapi20.py b/pymysql/tests/thirdparty/test_MySQLdb/dbapi20.py index 78d4ee3..d6fcabf 100644 --- a/pymysql/tests/thirdparty/test_MySQLdb/dbapi20.py +++ b/pymysql/tests/thirdparty/test_MySQLdb/dbapi20.py @@ -15,7 +15,11 @@ __rcs_id__ = '$Id$' __version__ = '$Revision$'[11:-2] __author__ = 'Stuart Bishop ' -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest + import time # $Log$ diff --git a/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_capabilities.py b/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_capabilities.py index 882a4f9..df089a4 100644 --- a/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_capabilities.py +++ b/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_capabilities.py @@ -1,6 +1,9 @@ #!/usr/bin/env python from . import capabilities -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest import pymysql from pymysql.tests import base import warnings diff --git a/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_nonstandard.py b/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_nonstandard.py index be90356..c568524 100644 --- a/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_nonstandard.py +++ b/pymysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_nonstandard.py @@ -1,5 +1,8 @@ import sys -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest import pymysql _mysql = pymysql