summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-03-02 12:41:33 +0000
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-03-02 12:41:33 +0000
commit3a441467c055fa7e8a349b7e5430053e53600e0f (patch)
tree4f2db96e18c41e931bbe91ee45c518565a4b9811
parent6be94f1927803fbe54245a53bcb8b66d12aa94e7 (diff)
parent5a65ff5cf414ad752a46a74f4abcdda64188c410 (diff)
downloadpsycopg2-3a441467c055fa7e8a349b7e5430053e53600e0f.tar.gz
Merge branch 'no-unittest2'
Close #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