Merge branch 'main' into benchling-allof-support

Author: dbanty

end_to_end_tests/golden-record/my_test_api_client/models/validation_error.py

@@ -11,20 +11,20 @@ class ValidationError:
 
     loc: List[str]
     msg: str
-    type: str
+    type_: str
 
     def to_dict(self) -> Dict[str, Any]:
         loc = self.loc
 
         msg = self.msg
-        type = self.type
+        type_ = self.type_
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(
             {
                 "loc": loc,
                 "msg": msg,
-                "type": type,
+                "type": type_,
             }
         )
 
@@ -37,12 +37,12 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
 
         msg = d.pop("msg")
 
-        type = d.pop("type")
+        type_ = d.pop("type")
 
         validation_error = cls(
             loc=loc,
             msg=msg,
-            type=type,
+            type_=type_,
         )
 
         return validation_error

openapi_python_client/parser/properties/enum_property.py

@@ -52,7 +52,7 @@ def values_from_list(values: List[ValueType]) -> Dict[str, ValueType]:
                 else:
                     output[f"VALUE_{value}"] = value
                 continue
-            if value[0].isalpha():
+            if value and value[0].isalpha():
                 key = value.upper()
             else:
                 key = f"VALUE_{i}"

openapi_python_client/utils.py

@@ -1,3 +1,4 @@
+import builtins
 import re
 from keyword import iskeyword
 
@@ -15,7 +16,7 @@ def fix_keywords(value: str) -> str:
     return value
 
 
-RESERVED_WORDS = ("self",)
+RESERVED_WORDS = set(dir(builtins)).union({"self"})
 
 
 def fix_reserved_words(value: str) -> str:

tests/test_parser/test_properties/test_init.py

@@ -508,7 +508,7 @@ def test_get_imports(self, mocker):
     def test_values_from_list(self):
         from openapi_python_client.parser.properties import EnumProperty
 
-        data = ["abc", "123", "a23", "1bc", 4, -3, "a Thing WIth spaces"]
+        data = ["abc", "123", "a23", "1bc", 4, -3, "a Thing WIth spaces", ""]
 
         result = EnumProperty.values_from_list(data)
 
@@ -520,6 +520,7 @@ def test_values_from_list(self):
             "VALUE_4": 4,
             "VALUE_NEGATIVE_3": -3,
             "A_THING_WITH_SPACES": "a Thing WIth spaces",
+            "VALUE_7": "",
         }
 
     def test_values_from_list_duplicate(self):

tests/test_utils.py

@@ -38,8 +38,11 @@ def test__fix_keywords():
     assert utils.fix_keywords("None") == "None_"
 
 
-def test__fix_reserved_words():
-    assert utils.fix_reserved_words("self") == "self_"
+@pytest.mark.parametrize(
+    "reserved_word, expected", [("self", "self_"), ("int", "int_"), ("dict", "dict_"), ("not_reserved", "not_reserved")]
+)
+def test__fix_reserved_words(reserved_word: str, expected: str):
+    assert utils.fix_reserved_words(reserved_word) == expected
 
 
 def test_to_valid_python_identifier():