Revert "Fix bug"

forest-benchling · dbanty · commit 9da37c6e43bb · 2021-08-01T16:54:01.000-06:00
This reverts commit 7561c01.
diff --git a/openapi_python_client/parser/properties/model_property.py b/openapi_python_client/parser/properties/model_property.py
@@ -67,10 +67,8 @@ def _is_subtype(first: Property, second: Property) -> bool:
             _is_int_enum(first) and isinstance(second, IntProperty),
             _is_string_enum(first)
             and _is_string_enum(second)
-            and set(e.value for e in first) <= set(e.value for e in second),
-            _is_int_enum(first)
-            and _is_int_enum(second)
-            and set(e.value for e in first) <= set(e.value for e in second),
+            and set(first.values.items()) <= set(second.values.items()),
+            _is_int_enum(first) and _is_int_enum(second) and set(first.values.items()) <= set(second.values.items()),
         ]
     )
 

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,8 @@ def _is_subtype(first: Property, second: Property) -> bool:`
`67`	`67`	`_is_int_enum(first) and isinstance(second, IntProperty),`
`68`	`68`	`_is_string_enum(first)`
`69`	`69`	`and _is_string_enum(second)`
`70`		`- and set(e.value for e in first) <= set(e.value for e in second),`
`71`		`- _is_int_enum(first)`
`72`		`- and _is_int_enum(second)`
`73`		`- and set(e.value for e in first) <= set(e.value for e in second),`
	`70`	`+ and set(first.values.items()) <= set(second.values.items()),`
	`71`	`+ _is_int_enum(first) and _is_int_enum(second) and set(first.values.items()) <= set(second.values.items()),`
`74`	`72`	`]`
`75`	`73`	`)`
`76`	`74`