summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-03-01 20:44:04 +0000
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-03-01 20:44:04 +0000
commit5a65ff5cf414ad752a46a74f4abcdda64188c410 (patch)
tree797505e1342f973c1a48dab790718fbb9e2c482d
parent455f51c36ce6100b0da816e0056af60fa978c8a6 (diff)
downloadpsycopg2-no-unittest2.tar.gz
Don't try to use unittest2no-unittest2
Modules importing unittest directly would miss the monkeypatch: see ticket #516.
-rw-r--r--tests/testutils.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/testutils.py b/tests/testutils.py
index 179f4df..00d5f24 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