From 7686335626ae4361191e189ac75649a5b2cd58e3 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 19 Dec 2014 15:30:24 -0600 Subject: testsuite/common.py: Default to using unittest2 Only fallback to unittest if unittest2 is unavailable. Signed-off-by: Sol Jerome --- testsuite/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testsuite') diff --git a/testsuite/common.py b/testsuite/common.py index a86e9c5d9..4b29e5f52 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -16,9 +16,9 @@ import lxml.etree import Bcfg2.Options from mock import patch, MagicMock, _patch, DEFAULT try: - from unittest import skip, skipIf, skipUnless, TestCase -except ImportError: from unittest2 import skip, skipIf, skipUnless, TestCase +except ImportError: + from unittest import skip, skipIf, skipUnless, TestCase #: The XInclude namespace name XI_NAMESPACE = "http://www.w3.org/2001/XInclude" -- cgit v1.2.3-1-g7c22