Remove wrong model_parent argument in Property.get_type_string

Author: mtovt

openapi_python_client/parser/properties/__init__.py

@@ -270,7 +270,6 @@ def get_type_string(
         no_optional: bool = False,
         json: bool = False,
         *,
-        model_parent: Optional[ModelProperty] = None,  # pylint:disable=unused-argument
         quoted: bool = False,
     ) -> str:
         """

openapi_python_client/parser/properties/model_property.py

@@ -92,7 +92,6 @@ def get_type_string(
         no_optional: bool = False,
         json: bool = False,
         *,
-        model_parent: Optional[ModelProperty] = None,
         quoted: bool = False,
     ) -> str:
         """
@@ -108,10 +107,6 @@ def get_type_string(
             type_string = self.get_base_type_string()
 
         if quoted:
-            if model_parent:
-                if type_string == model_parent.class_info.name:
-                    type_string = f"'{type_string}'"
-
             if type_string == self.class_info.name:
                 type_string = f"'{type_string}'"
 

openapi_python_client/parser/properties/property.py

@@ -78,7 +78,6 @@ def get_type_string(
         no_optional: bool = False,
         json: bool = False,
         *,
-        model_parent: Optional[ModelProperty] = None,
         quoted: bool = False,
     ) -> str:
         """
@@ -133,12 +132,8 @@ def get_lazy_imports(self, *, prefix: str) -> Set[str]:
         """
         return set()
 
-    def to_string(self, *, model_parent: Optional[ModelProperty] = None) -> str:
-        """How this should be declared in a dataclass
-
-        Args:
-            model_parent: The ModelProperty which contains this Property (used for template type annotations)
-        """
+    def to_string(self) -> str:
+        """How this should be declared in a dataclass"""
         default: Optional[str]
         if self.default is not None:
             default = self.default
@@ -148,8 +143,8 @@ def to_string(self, *, model_parent: Optional[ModelProperty] = None) -> str:
             default = None
 
         if default is not None:
-            return f"{self.python_name}: {self.get_type_string(model_parent=model_parent, quoted=True)} = {default}"
-        return f"{self.python_name}: {self.get_type_string(model_parent=model_parent, quoted=True)}"
+            return f"{self.python_name}: {self.get_type_string(quoted=True)} = {default}"
+        return f"{self.python_name}: {self.get_type_string(quoted=True)}"
 
     def to_docstring(self) -> str:
         """Returns property docstring"""

openapi_python_client/templates/model.py.jinja

@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 
 
 {% if model.additional_properties %}
-{% set additional_property_type = 'Any' if model.additional_properties == True else model.additional_properties.get_type_string(model_parent=model, quoted=not model.additional_properties.is_base_type) %}
+{% set additional_property_type = 'Any' if model.additional_properties == True else model.additional_properties.get_type_string(quoted=not model.additional_properties.is_base_type) %}
 {% endif %}
 
 {% set class_name = model.class_info.name %}
@@ -64,7 +64,7 @@ class {{ class_name }}:
     {% endfor %}
     {% for property in model.required_properties + model.optional_properties %}
     {% if property.default is not none or not property.required %}
-    {{ property.to_string(model_parent=model) }}
+    {{ property.to_string() }}
     {% endif %}
     {% endfor %}
     {% if model.additional_properties %}

tests/test_parser/test_properties/test_model_property.py

@@ -54,18 +54,6 @@ def test_get_imports(self, model_property_factory):
             "from typing import cast",
         }
 
-    @pytest.mark.parametrize(
-        "quoted,expected",
-        [
-            (False, "MyClass"),
-            (True, "'MyClass'"),
-        ],
-    )
-    def test_get_type_string_parent(self, model_property_factory, quoted, expected):
-        parent = model_property_factory()
-        m = model_property_factory()
-        assert m.get_type_string(model_parent=parent, quoted=quoted) == expected
-
     def test_get_lazy_imports(self, model_property_factory):
         prop = model_property_factory(required=False, nullable=True)