From 5a65ff5cf414ad752a46a74f4abcdda64188c410 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Wed, 1 Mar 2017 20:44:04 +0000 Subject: [PATCH] Don't try to use unittest2 Modules importing unittest directly would miss the monkeypatch: see ticket #516. --- tests/testutils.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/testutils.py b/tests/testutils.py index 179f4df3..00d5f248 100644 --- a/tests/testutils.py +++ b/tests/testutils.py @@ -22,22 +22,15 @@ # License for more details. -# Use unittest2 if available. Otherwise mock a skip facility with warnings. - import re import os import sys import select import platform +import unittest from functools import wraps from testconfig import dsn, repl_dsn -try: - import unittest2 - unittest = unittest2 -except ImportError: - import unittest - unittest2 = None if hasattr(unittest, 'skipIf'): skip = unittest.skip