Clean up a few items for #29

Author: dbanty

openapi_python_client/__init__.py

@@ -8,12 +8,12 @@
 from pathlib import Path
 from typing import Any, Dict, Optional
 
-import stringcase
 import httpx
 import yaml
 from jinja2 import Environment, PackageLoader
 
 from openapi_python_client import utils
+
 from .openapi_parser import OpenAPI, import_string_from_reference
 
 __version__ = version(__package__)

openapi_python_client/openapi_parser/properties.py

@@ -2,6 +2,7 @@
 from typing import Any, ClassVar, Dict, List, Optional
 
 from openapi_python_client import utils
+
 from .reference import Reference
 
 
@@ -16,9 +17,10 @@ class Property:
     constructor_template: ClassVar[Optional[str]] = None
     _type_string: ClassVar[str]
 
-    @property
-    def python_name(self):
-        return utils.snake_case(self.name)
+    python_name: str = field(init=False)
+
+    def __post_init__(self) -> None:
+        self.python_name = utils.snake_case(self.name)
 
     def get_type_string(self) -> str:
         """ Get a string representation of type that should be used when declaring this property """

openapi_python_client/templates/model.pyi

@@ -22,7 +22,7 @@ class {{ schema.reference.class_name }}:
             "{{ property.name }}": self.{{ property.transform() }},
             {% endfor %}
             {% for property in schema.optional_properties %}
-            "{{ property.name }}": self.{{ property.transform() }} if self.{{property.python_name}} is not None else None,
+            "{{ property.name }}": self.{{ property.transform() }} if self.{{ property.python_name }} is not None else None,
                                                                                                                        {% endfor %}
         }
 
@@ -33,7 +33,7 @@ class {{ schema.reference.class_name }}:
         {% if property.constructor_template %}
         {% include property.constructor_template %}
         {% else %}
-        {{property.python_name}} = {{property.constructor_from_dict("d")}}
+        {{ property.python_name }} = {{ property.constructor_from_dict("d") }}
         {% endif %}
 
         {% endfor %}

openapi_python_client/utils.py

@@ -1,6 +1,7 @@
-import stringcase
 import re
 
+import stringcase
+
 
 def snake_case(value: str) -> str:
     value = re.sub(r"([A-Z]{2,})([A-Z][a-z]|[ -_]|$)", lambda m: m.group(1).title() + m.group(2), value.strip())

tests/test_end_to_end/test_end_to_end.py

@@ -19,7 +19,10 @@ def _compare_directories(first: Path, second: Path, /):
     match, mismatch, errors = cmpfiles(first, second, dc.common_files, shallow=False)
     if mismatch:
         for error in errors:
-            pytest.fail(f"{first_printable} and {second_printable} had differing files: {mismatch}, first error is {error}", pytrace=False)
+            pytest.fail(
+                f"{first_printable} and {second_printable} had differing files: {mismatch}, first error is {error}",
+                pytrace=False,
+            )
 
     for sub_path in dc.common_dirs:
         _compare_directories(first / sub_path, second / sub_path)