Skip to content

Commit 806bda7

Browse files
committed
Revert "Add ValidatorMixin.validator_for"
A more drastic solution is in order. This reverts commit dfcd6e8.
1 parent dfcd6e8 commit 806bda7

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

jsonschema.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,6 @@ def check_schema(cls, schema):
267267
for error in cls(cls.META_SCHEMA).iter_errors(schema):
268268
raise SchemaError.create_from(error)
269269

270-
def validator_for(self, validator):
271-
validator_attr = "validate_%s" % (validator.lstrip("$"),)
272-
return getattr(self, validator_attr, None)
273-
274270
def iter_errors(self, instance, _schema=None):
275271
if _schema is None:
276272
_schema = self.schema
@@ -283,7 +279,9 @@ def iter_errors(self, instance, _schema=None):
283279
validators = iteritems(_schema)
284280

285281
for k, v in validators:
286-
validator = self.validator_for(k)
282+
validator_attr = "validate_%s" % (k.lstrip("$"),)
283+
validator = getattr(self, validator_attr, None)
284+
287285
if validator is None:
288286
continue
289287

tests.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -834,24 +834,6 @@ class Validator(ValidatorMixin):
834834
self.assertTrue(Validator.validate_ref.called)
835835
self.assertFalse(Validator.validate_type.called)
836836

837-
def test_validator_for(self):
838-
class Validator(ValidatorMixin):
839-
validate_type = mock.Mock()
840-
validator = Validator({})
841-
self.assertEqual(
842-
validator.validator_for("type"), validator.validate_type,
843-
)
844-
845-
def test_redefined_validator_for(self):
846-
v = mock.Mock(return_value=[])
847-
848-
class Validator(ValidatorMixin):
849-
def validator_for(self, validator):
850-
return v
851-
852-
Validator({"foo" : 12}).validate(42)
853-
v.assert_called_once_with(12, 42, {"foo" : 12})
854-
855837

856838
class TestRefResolver(unittest.TestCase):
857839

0 commit comments

Comments
 (0)