From 0f9ff8b30afdfc78a449caddb213bbcc7b319470 Mon Sep 17 00:00:00 2001 From: Lewis Headden Date: Thu, 2 Nov 2017 10:59:11 -0400 Subject: [PATCH] Continue loop on excluded primitive --- openapi/preprocess_spec.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/openapi/preprocess_spec.py b/openapi/preprocess_spec.py index 4519e27..df28e3e 100644 --- a/openapi/preprocess_spec.py +++ b/openapi/preprocess_spec.py @@ -260,15 +260,16 @@ def find_replace_ref_recursive(root, ref_name, replace_map): def inline_primitive_models(spec, excluded_primitives): to_remove_models = [] for k, v in spec['definitions'].items(): - if k not in excluded_primitives: - if "properties" not in v: - if k == "intstr.IntOrString": - v["type"] = "object" - if "type" not in v: - v["type"] = "object" - print("Making model `%s` inline as %s..." % (k, v["type"])) - find_replace_ref_recursive(spec, "#/definitions/" + k, v) - to_remove_models.append(k) + if k in excluded_primitives: + continue + if "properties" not in v: + if k == "intstr.IntOrString": + v["type"] = "object" + if "type" not in v: + v["type"] = "object" + print("Making model `%s` inline as %s..." % (k, v["type"])) + find_replace_ref_recursive(spec, "#/definitions/" + k, v) + to_remove_models.append(k) for k in to_remove_models: del spec['definitions'][k]