# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 1286659252 18000 # Node ID e24fb3e27ec9c2f6b71b97fe23053207b031c2da # Parent bfb88a304ebe36fc56c8fa4d9d44e3ecc2a2fcde test_util: use SkipTest if provided by the unittest module. This is the case with Python 2.7. diff --git a/tests/test_util.py b/tests/test_util.py --- a/tests/test_util.py +++ b/tests/test_util.py @@ -26,12 +26,15 @@ from mercurial import ui from mercurial import extensions try: - from unittest2 import SkipTest -except ImportError: + SkipTest = unittest.SkipTest +except AttributeError: try: - from nose import SkipTest + from unittest2 import SkipTest except ImportError: - SkipTest = None + try: + from nose import SkipTest + except ImportError: + SkipTest = None from hgsubversion import util