From 740f82e3501909df2ab229e4e58f73c3909c8c04 Mon Sep 17 00:00:00 2001 From: Chris W Date: Sun, 6 Aug 2023 20:09:27 -0400 Subject: [PATCH] Revert "WIP: Resolve defaults through reffs" --- python_jsonschema_objects/classbuilder.py | 3 -- test/test_regression_217.py | 37 ----------------------- 2 files changed, 40 deletions(-) delete mode 100644 test/test_regression_217.py diff --git a/python_jsonschema_objects/classbuilder.py b/python_jsonschema_objects/classbuilder.py index bfd52cc..0ed8a33 100644 --- a/python_jsonschema_objects/classbuilder.py +++ b/python_jsonschema_objects/classbuilder.py @@ -667,9 +667,6 @@ def _build_object(self, nm, clsdata, parents, **kw): props[prop] = make_property(prop, {"type": typ}, typ.__doc__) properties[prop]["$ref"] = ref properties[prop]["type"] = typ - if getattr(typ, "default", None) is not None: - defaults.add(prop) - properties[prop]["default"] = typ.default() elif "oneOf" in detail: potential = self.expand_references(nm, detail["oneOf"]) diff --git a/test/test_regression_217.py b/test/test_regression_217.py deleted file mode 100644 index f8bd28c..0000000 --- a/test/test_regression_217.py +++ /dev/null @@ -1,37 +0,0 @@ -import json -import pytest -import python_jsonschema_objects as pjo - -schema = { - "$schema": "http://json-schema.org/draft-04/schema#", - "$id": "schema.json", - "$ref": "#/definitions/test", - "definitions": { - "test": { - "type": "object", - "properties": { - "name": {"$ref": "#/definitions/name"}, - "number": {"type": "number", "default": 10}, - "object": {"$ref": "#/definitions/object"}, - }, - }, - "name": {"type": "string", "default": "String"}, - "number": {"type": "number", "default": 10}, - "object": {"type": "object", "default": {}}, - }, -} - - -@pytest.fixture -def schema_json(): - return schema - - -def test_reffed_defaults_work(schema_json): - builder = pjo.ObjectBuilder(schema_json) - ns = builder.build_classes() - - test = ns.Test() - - expected = {"name": "String", "number": 10, "object": {}} - assert test.as_dict() == expected