2.6 support was dropped already.

Author: Julian

jsonschema/tests/compat.py

@@ -1,11 +1,3 @@
-import sys
-
-
-if sys.version_info[:2] < (2, 7):  # pragma: no cover
-    import unittest2 as unittest
-else:
-    import unittest
-
 try:
     from unittest import mock
 except ImportError:

jsonschema/tests/test_cli.py

@@ -1,7 +1,9 @@
+from unittest import TestCase
+
 from jsonschema import Draft4Validator, ValidationError, cli
 from jsonschema.compat import StringIO
 from jsonschema.exceptions import SchemaError
-from jsonschema.tests.compat import mock, unittest
+from jsonschema.tests.compat import mock
 
 
 def fake_validator(*errors):
@@ -22,7 +24,7 @@ def check_schema(self, schema):
     return FakeValidator
 
 
-class TestParser(unittest.TestCase):
+class TestParser(TestCase):
     FakeValidator = fake_validator()
 
     def setUp(self):
@@ -59,7 +61,7 @@ def test_find_validator_in_jsonschema(self):
         self.assertIs(arguments["validator"], Draft4Validator)
 
 
-class TestCLI(unittest.TestCase):
+class TestCLI(TestCase):
     def test_draft3_schema_draft4_validator(self):
         stdout, stderr = StringIO(), StringIO()
         with self.assertRaises(SchemaError):

jsonschema/tests/test_exceptions.py

@@ -1,11 +1,12 @@
+from unittest import TestCase
 import textwrap
 
 from jsonschema import Draft4Validator, exceptions
 from jsonschema.compat import PY3
-from jsonschema.tests.compat import mock, unittest
+from jsonschema.tests.compat import mock
 
 
-class TestBestMatch(unittest.TestCase):
+class TestBestMatch(TestCase):
     def best_match(self, errors):
         errors = list(errors)
         best = exceptions.best_match(errors)
@@ -159,7 +160,7 @@ def test_no_errors(self):
         self.assertIsNone(exceptions.best_match(validator.iter_errors({})))
 
 
-class TestByRelevance(unittest.TestCase):
+class TestByRelevance(TestCase):
     def test_short_paths_are_better_matches(self):
         shallow = exceptions.ValidationError("Oh no!", path=["baz"])
         deep = exceptions.ValidationError("Oh yes!", path=["foo", "bar"])
@@ -211,7 +212,7 @@ def test_strong_validators_are_higher_priority(self):
         self.assertIs(match, strong)
 
 
-class TestErrorTree(unittest.TestCase):
+class TestErrorTree(TestCase):
     def test_it_knows_how_many_total_errors_it_contains(self):
         errors = [mock.MagicMock() for _ in range(8)]
         tree = exceptions.ErrorTree(errors)
@@ -287,7 +288,7 @@ def test_if_its_in_the_tree_anyhow_it_does_not_raise_an_error(self):
         self.assertIsInstance(tree["foo"], exceptions.ErrorTree)
 
 
-class TestErrorInitReprStr(unittest.TestCase):
+class TestErrorInitReprStr(TestCase):
     def make_error(self, **kwargs):
         defaults = dict(
             message=u"hello",

jsonschema/tests/test_format.py

@@ -3,13 +3,14 @@
 
 """
 
-from jsonschema.tests.compat import mock, unittest
+from unittest import TestCase
 
 from jsonschema import FormatError, ValidationError, FormatChecker
+from jsonschema.tests.compat import mock
 from jsonschema.validators import Draft4Validator
 
 
-class TestFormatChecker(unittest.TestCase):
+class TestFormatChecker(TestCase):
     def setUp(self):
         self.fn = mock.Mock()
 

jsonschema/tests/test_jsonschema_test_suite.py

@@ -17,6 +17,7 @@
 import re
 import subprocess
 import sys
+import unittest
 
 try:
     from sys import pypy_version_info
@@ -29,7 +30,7 @@
     draft4_format_checker, validate,
 )
 from jsonschema.compat import PY3
-from jsonschema.tests.compat import mock, unittest
+from jsonschema.tests.compat import mock
 import jsonschema
 
 

jsonschema/tests/test_validators.py

@@ -1,16 +1,17 @@
 from collections import deque
 from contextlib import contextmanager
+from unittest import TestCase
 import json
 
 from jsonschema import FormatChecker, SchemaError, ValidationError
-from jsonschema.tests.compat import mock, unittest
+from jsonschema.tests.compat import mock
 from jsonschema.validators import (
     RefResolutionError, UnknownType, Draft3Validator,
     Draft4Validator, RefResolver, create, extend, validator_for, validate,
 )
 
 
-class TestCreateAndExtend(unittest.TestCase):
+class TestCreateAndExtend(TestCase):
     def setUp(self):
         self.meta_schema = {u"properties": {u"smelly": {}}}
         self.smelly = mock.MagicMock()
@@ -74,7 +75,7 @@ def test_extend(self):
         self.assertEqual(Extended.DEFAULT_TYPES, self.Validator.DEFAULT_TYPES)
 
 
-class TestIterErrors(unittest.TestCase):
+class TestIterErrors(TestCase):
     def setUp(self):
         self.validator = Draft3Validator({})
 
@@ -108,7 +109,7 @@ def test_iter_errors_multiple_failures_one_validator(self):
         self.assertEqual(len(errors), 4)
 
 
-class TestValidationErrorMessages(unittest.TestCase):
+class TestValidationErrorMessages(TestCase):
     def message_for(self, instance, schema, *args, **kwargs):
         kwargs.setdefault("cls", Draft3Validator)
         with self.assertRaises(ValidationError) as e:
@@ -216,7 +217,7 @@ def test_additionalProperties_false_patternProperties(self):
         )
 
 
-class TestValidationErrorDetails(unittest.TestCase):
+class TestValidationErrorDetails(TestCase):
     # TODO: These really need unit tests for each individual validator, rather
     #       than just these higher level tests.
     def test_anyOf(self):
@@ -692,7 +693,7 @@ def test_is_type_raises_exception_for_unknown_type(self):
             self.validator.is_type("foo", object())
 
 
-class TestDraft3Validator(ValidatorTestMixin, unittest.TestCase):
+class TestDraft3Validator(ValidatorTestMixin, TestCase):
     validator_class = Draft3Validator
 
     def test_is_type_is_true_for_any_type(self):
@@ -708,11 +709,11 @@ def test_non_string_custom_types(self):
         cls.validate(None, schema)
 
 
-class TestDraft4Validator(ValidatorTestMixin, unittest.TestCase):
+class TestDraft4Validator(ValidatorTestMixin, TestCase):
     validator_class = Draft4Validator
 
 
-class TestBuiltinFormats(unittest.TestCase):
+class TestBuiltinFormats(TestCase):
     """
     The built-in (specification-defined) formats do not raise type errors.
 
@@ -732,7 +733,7 @@ def test(self, format=format):
     del test  # Ugh py.test. Stop discovering top level tests.
 
 
-class TestValidatorFor(unittest.TestCase):
+class TestValidatorFor(TestCase):
     def test_draft_3(self):
         schema = {"$schema": "http://json-schema.org/draft-03/schema"}
         self.assertIs(validator_for(schema), Draft3Validator)
@@ -759,7 +760,7 @@ def test_validator_for_custom_default(self):
         self.assertIs(validator_for({}, default=None), None)
 
 
-class TestValidate(unittest.TestCase):
+class TestValidate(TestCase):
     def test_draft3_validator_is_chosen(self):
         schema = {"$schema": "http://json-schema.org/draft-03/schema#"}
         with mock.patch.object(Draft3Validator, "check_schema") as chk_schema:
@@ -799,7 +800,7 @@ def test_schema_error_message(self):
         )
 
 
-class TestRefResolver(unittest.TestCase):
+class TestRefResolver(TestCase):
 
     base_uri = ""
     stored_uri = "foo://stored"
@@ -951,11 +952,11 @@ def test_it_properly_formats_an_error_message(self):
         self.assertIn("(1, 1) has non-unique elements", str(e.exception))
 
 
-class TestDraft4UniqueTupleItems(UniqueTupleItemsMixin, unittest.TestCase):
+class TestDraft4UniqueTupleItems(UniqueTupleItemsMixin, TestCase):
     validator_class = Draft4Validator
 
 
-class TestDraft3UniqueTupleItems(UniqueTupleItemsMixin, unittest.TestCase):
+class TestDraft3UniqueTupleItems(UniqueTupleItemsMixin, TestCase):
     validator_class = Draft3Validator