Fixing possible null reference and ensuring var names length matches the values length

Author: Barry Barrette

openapi_python_client/parser/properties/enum_property.py

@@ -121,7 +121,7 @@ def build(  # noqa: PLR0911
         if parent_name:
             class_name = f"{utils.pascal_case(parent_name)}{utils.pascal_case(class_name)}"
         class_info = Class.from_string(string=class_name, config=config)
-        var_names = data.model_extra.get("x-enum-varnames", [])
+        var_names = data.model_extra.get("x-enum-varnames", []) if data.model_extra else []
         values = EnumProperty.values_from_list(value_list, class_info, var_names)
 
         if class_info.name in schemas.classes_by_name:
@@ -184,15 +184,16 @@ def get_imports(self, *, prefix: str) -> set[str]:
         return imports
 
     @staticmethod
-    def values_from_list(values: list[str] | list[int], class_info: Class, varnames: list[str]) -> dict[str, ValueType]:
+    def values_from_list(values: list[str] | list[int], class_info: Class, var_names: list[str]) -> dict[str, ValueType]:
         """Convert a list of values into dict of {name: value}, where value can sometimes be None"""
         output: dict[str, ValueType] = {}
+        use_var_names = len(var_names) == len(values)
 
         for i, value in enumerate(values):
             value = cast(Union[str, int], value)
             if isinstance(value, int):
-                if varnames:
-                    key = varnames[i].upper()
+                if use_var_names:
+                    key = var_names[i].upper()
                     output[key] = value
                 elif value < 0:
                     output[f"VALUE_NEGATIVE_{-value}"] = value