diff options
Diffstat (limited to 'netlib/tutils.py')
| -rw-r--r-- | netlib/tutils.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/netlib/tutils.py b/netlib/tutils.py index 452766d6..5f598fa9 100644 --- a/netlib/tutils.py +++ b/netlib/tutils.py @@ -4,7 +4,6 @@ import os import time import shutil from contextlib import contextmanager -import six import sys from netlib import utils, tcp, http @@ -31,20 +30,20 @@ def tmpdir(*args, **kwargs): def _check_exception(expected, actual, exc_tb): - if isinstance(expected, six.string_types): + if isinstance(expected, str): if expected.lower() not in str(actual).lower(): - six.reraise(AssertionError, AssertionError( + raise AssertionError( "Expected %s, but caught %s" % ( repr(expected), repr(actual) ) - ), exc_tb) + ) else: if not isinstance(actual, expected): - six.reraise(AssertionError, AssertionError( + raise AssertionError( "Expected %s, but caught %s %s" % ( expected.__name__, actual.__class__.__name__, repr(actual) ) - ), exc_tb) + ) def raises(expected_exception, obj=None, *args, **kwargs): |