[Python-experimental] Fix type error if oneof/anyof child schema is n…

…ull type (#6387) * Mustache template should use invokerPackage tag to generate import * Fix runtime exception when composed schema has 'null' type * Fix runtime exception when composed schema has 'null' type
OpenAPITools · May 25, 2020 · 583aa24 · 583aa24
1 parent afb3188
commit 583aa24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
@@ -779,7 +779,7 @@ def get_discriminator_class(model_class,
             model_class._composed_schemas.get('allOf', ())
         for cls in composed_children:
             # Check if the schema has inherited discriminators.
-            if cls.discriminator is not None:
+            if hasattr(cls, 'discriminator') and cls.discriminator is not None:
                 used_model_class = get_discriminator_class(
                                     cls, discr_name, discr_value, cls_visited)
                 if used_model_class is not None:

diff --git a/samples/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -1046,7 +1046,7 @@ def get_discriminator_class(model_class,
             model_class._composed_schemas.get('allOf', ())
         for cls in composed_children:
             # Check if the schema has inherited discriminators.
-            if cls.discriminator is not None:
+            if hasattr(cls, 'discriminator') and cls.discriminator is not None:
                 used_model_class = get_discriminator_class(
                                     cls, discr_name, discr_value, cls_visited)
                 if used_model_class is not None:

diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -1046,7 +1046,7 @@ def get_discriminator_class(model_class,
             model_class._composed_schemas.get('allOf', ())
         for cls in composed_children:
             # Check if the schema has inherited discriminators.
-            if cls.discriminator is not None:
+            if hasattr(cls, 'discriminator') and cls.discriminator is not None:
                 used_model_class = get_discriminator_class(
                                     cls, discr_name, discr_value, cls_visited)
                 if used_model_class is not None: