diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/basic/module/thrift_mutable_types.pyi b/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/basic/module/thrift_mutable_types.pyi index 513379adb9461b..208370d15fc3b9 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/basic/module/thrift_mutable_types.pyi +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/basic/module/thrift_mutable_types.pyi @@ -124,24 +124,24 @@ class Containers(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compati @property - def StringToI64Map(self) -> _typing.MutableMapping[str, int]: ... + def StringToI64Map(self) -> _fbthrift_python_mutable_containers.MutableMap[str, int]: ... @StringToI64Map.setter - def StringToI64Map(self, value: _typing.MutableMapping[str, int]): ... + def StringToI64Map(self, value: _fbthrift_python_mutable_containers.MutableMap[str, int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, I32List: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., StringSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[str] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - StringToI64Map: _typing.Optional[_typing.MutableMapping[str, int]]=... + StringToI64Map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( self, *, I32List: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., StringSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[str] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - StringToI64Map: _typing.Optional[_typing.MutableMapping[str, int]]=... + StringToI64Map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[str], _typing.MutableMapping[str, int]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[str], _fbthrift_python_mutable_containers.MutableMap[str, int]]]]: ... def _to_python(self) -> "test.fixtures.basic.module.thrift_types.Containers": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "test.fixtures.basic.module.types.Containers": ... # type: ignore diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/complex-struct/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi b/third-party/thrift/src/thrift/compiler/test/fixtures/complex-struct/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi index b209c322ee313f..c7e99f9087bfa9 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/complex-struct/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/complex-struct/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi @@ -85,22 +85,22 @@ class MyStructMapFloatThrowExp(_fbthrift_python_mutable_types.MutableStruct, _fb myLongField: int = ... @property - def mapListOfFloats(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]: ... + def mapListOfFloats(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]: ... @mapListOfFloats.setter - def mapListOfFloats(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]): ... + def mapListOfFloats(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, myLongField: _typing.Optional[int]=..., - mapListOfFloats: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]=... + mapListOfFloats: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( self, *, myLongField: _typing.Optional[int]=..., - mapListOfFloats: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]=... + mapListOfFloats: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]]]: ... def _to_python(self) -> "module.thrift_types.MyStructMapFloatThrowExp": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.MyStructMapFloatThrowExp": ... # type: ignore @@ -165,39 +165,39 @@ class MyStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatibl @property - def mShortString(self) -> _typing.MutableMapping[int, str]: ... + def mShortString(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @mShortString.setter - def mShortString(self, value: _typing.MutableMapping[int, str]): ... + def mShortString(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mIntegerString(self) -> _typing.MutableMapping[int, str]: ... + def mIntegerString(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @mIntegerString.setter - def mIntegerString(self, value: _typing.MutableMapping[int, str]): ... + def mIntegerString(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mStringMyStruct(self) -> _typing.MutableMapping[str, MyStruct]: ... + def mStringMyStruct(self) -> _fbthrift_python_mutable_containers.MutableMap[str, MyStruct]: ... @mStringMyStruct.setter - def mStringMyStruct(self, value: _typing.MutableMapping[str, MyStruct]): ... + def mStringMyStruct(self, value: _fbthrift_python_mutable_containers.MutableMap[str, MyStruct] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mStringBool(self) -> _typing.MutableMapping[str, bool]: ... + def mStringBool(self) -> _fbthrift_python_mutable_containers.MutableMap[str, bool]: ... @mStringBool.setter - def mStringBool(self, value: _typing.MutableMapping[str, bool]): ... + def mStringBool(self, value: _fbthrift_python_mutable_containers.MutableMap[str, bool] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mIntegerInteger(self) -> _typing.MutableMapping[int, int]: ... + def mIntegerInteger(self) -> _fbthrift_python_mutable_containers.MutableMap[int, int]: ... @mIntegerInteger.setter - def mIntegerInteger(self, value: _typing.MutableMapping[int, int]): ... + def mIntegerInteger(self, value: _fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mIntegerBool(self) -> _typing.MutableMapping[int, bool]: ... + def mIntegerBool(self) -> _fbthrift_python_mutable_containers.MutableMap[int, bool]: ... @mIntegerBool.setter - def mIntegerBool(self, value: _typing.MutableMapping[int, bool]): ... + def mIntegerBool(self, value: _fbthrift_python_mutable_containers.MutableMap[int, bool] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property @@ -231,9 +231,9 @@ class MyStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatibl @property - def mListList(self) -> _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]]: ... + def mListList(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]]: ... @mListList.setter - def mListList(self, value: _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]]): ... + def mListList(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, @@ -253,18 +253,18 @@ class MyStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatibl lString: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[str] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., lBool: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[bool] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., lByte: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - mShortString: _typing.Optional[_typing.MutableMapping[int, str]]=..., - mIntegerString: _typing.Optional[_typing.MutableMapping[int, str]]=..., - mStringMyStruct: _typing.Optional[_typing.MutableMapping[str, _fbthrift_compatible_with_MyStruct]]=..., - mStringBool: _typing.Optional[_typing.MutableMapping[str, bool]]=..., - mIntegerInteger: _typing.Optional[_typing.MutableMapping[int, int]]=..., - mIntegerBool: _typing.Optional[_typing.MutableMapping[int, bool]]=..., + mShortString: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mIntegerString: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mStringMyStruct: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_compatible_with_MyStruct] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mStringBool: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, bool] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mIntegerInteger: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mIntegerBool: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, bool] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., sShort: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sMyStruct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_compatible_with_MyStruct] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sString: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[str] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sByte: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - mListList: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]]]=... + mListList: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( @@ -285,20 +285,20 @@ class MyStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatibl lString: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[str] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., lBool: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[bool] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., lByte: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - mShortString: _typing.Optional[_typing.MutableMapping[int, str]]=..., - mIntegerString: _typing.Optional[_typing.MutableMapping[int, str]]=..., - mStringMyStruct: _typing.Optional[_typing.MutableMapping[str, _fbthrift_compatible_with_MyStruct]]=..., - mStringBool: _typing.Optional[_typing.MutableMapping[str, bool]]=..., - mIntegerInteger: _typing.Optional[_typing.MutableMapping[int, int]]=..., - mIntegerBool: _typing.Optional[_typing.MutableMapping[int, bool]]=..., + mShortString: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mIntegerString: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mStringMyStruct: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_compatible_with_MyStruct] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mStringBool: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, bool] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mIntegerInteger: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mIntegerBool: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, bool] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., sShort: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sMyStruct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_compatible_with_MyStruct] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sString: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[str] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., sByte: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - mListList: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]]]=... + mListList: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, str, MyDataItem, MyEnum, bool, int, int, int, float, _fbthrift_python_mutable_containers.MutableList[float], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[str], _fbthrift_python_mutable_containers.MutableList[bool], _fbthrift_python_mutable_containers.MutableList[int], _typing.MutableMapping[int, str], _typing.MutableMapping[int, str], _typing.MutableMapping[str, MyStruct], _typing.MutableMapping[str, bool], _typing.MutableMapping[int, int], _typing.MutableMapping[int, bool], _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableSet[MyStruct], _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableSet[str], _fbthrift_python_mutable_containers.MutableSet[int], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, str, MyDataItem, MyEnum, bool, int, int, int, float, _fbthrift_python_mutable_containers.MutableList[float], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[str], _fbthrift_python_mutable_containers.MutableList[bool], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[str, MyStruct], _fbthrift_python_mutable_containers.MutableMap[str, bool], _fbthrift_python_mutable_containers.MutableMap[int, int], _fbthrift_python_mutable_containers.MutableMap[int, bool], _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableSet[MyStruct], _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableSet[str], _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int]]]]]: ... def _to_python(self) -> "module.thrift_types.MyStruct": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.MyStruct": ... # type: ignore @@ -348,9 +348,9 @@ class defaultStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_comp myDouble: float = ... @property - def field3(self) -> _typing.MutableMapping[int, str]: ... + def field3(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @field3.setter - def field3(self, value: _typing.MutableMapping[int, str]): ... + def field3(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property @@ -380,27 +380,27 @@ class defaultStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_comp @property - def mapNestlistStructDfSet(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[SimpleStruct]]: ... + def mapNestlistStructDfSet(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[SimpleStruct]]: ... @mapNestlistStructDfSet.setter - def mapNestlistStructDfSet(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[SimpleStruct]]): ... + def mapNestlistStructDfSet(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[SimpleStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapJavaTypeDFset(self) -> _typing.MutableMapping[int, str]: ... + def mapJavaTypeDFset(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @mapJavaTypeDFset.setter - def mapJavaTypeDFset(self, value: _typing.MutableMapping[int, str]): ... + def mapJavaTypeDFset(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def emptyMap(self) -> _typing.MutableMapping[int, int]: ... + def emptyMap(self) -> _fbthrift_python_mutable_containers.MutableMap[int, int]: ... @emptyMap.setter - def emptyMap(self, value: _typing.MutableMapping[int, int]): ... + def emptyMap(self, value: _fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def enumMapDFset(self) -> _typing.MutableMapping[str, _typing.MutableMapping[int, MyEnum]]: ... + def enumMapDFset(self) -> _fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableMap[int, MyEnum]]: ... @enumMapDFset.setter - def enumMapDFset(self, value: _typing.MutableMapping[str, _typing.MutableMapping[int, MyEnum]]): ... + def enumMapDFset(self, value: _fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableMap[int, MyEnum]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, @@ -415,17 +415,17 @@ class defaultStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_comp myDoubleDFset: _typing.Optional[float]=..., myDoubleDFZero: _typing.Optional[float]=..., myDouble: _typing.Optional[float]=..., - field3: _typing.Optional[_typing.MutableMapping[int, str]]=..., + field3: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., myList: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyEnum] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., mySet: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[str] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., simpleStruct: _typing.Optional[_fbthrift_compatible_with_SimpleStruct]=..., listStructDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_SimpleStruct] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., myUnion: _typing.Optional[_fbthrift_compatible_with_MyUnion]=..., listUnionDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyUnion] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - mapNestlistStructDfSet: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_SimpleStruct]]]=..., - mapJavaTypeDFset: _typing.Optional[_typing.MutableMapping[int, str]]=..., - emptyMap: _typing.Optional[_typing.MutableMapping[int, int]]=..., - enumMapDFset: _typing.Optional[_typing.MutableMapping[str, _typing.MutableMapping[int, _fbthrift_compatible_with_MyEnum]]]=... + mapNestlistStructDfSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_SimpleStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapJavaTypeDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + emptyMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + enumMapDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyEnum]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( @@ -441,19 +441,19 @@ class defaultStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_comp myDoubleDFset: _typing.Optional[float]=..., myDoubleDFZero: _typing.Optional[float]=..., myDouble: _typing.Optional[float]=..., - field3: _typing.Optional[_typing.MutableMapping[int, str]]=..., + field3: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., myList: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyEnum] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., mySet: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[str] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., simpleStruct: _typing.Optional[_fbthrift_compatible_with_SimpleStruct]=..., listStructDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_SimpleStruct] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., myUnion: _typing.Optional[_fbthrift_compatible_with_MyUnion]=..., listUnionDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyUnion] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - mapNestlistStructDfSet: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_SimpleStruct]]]=..., - mapJavaTypeDFset: _typing.Optional[_typing.MutableMapping[int, str]]=..., - emptyMap: _typing.Optional[_typing.MutableMapping[int, int]]=..., - enumMapDFset: _typing.Optional[_typing.MutableMapping[str, _typing.MutableMapping[int, _fbthrift_compatible_with_MyEnum]]]=... + mapNestlistStructDfSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_SimpleStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapJavaTypeDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + emptyMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + enumMapDFset: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyEnum]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, int, int, int, bytes, bytes, int, int, float, float, float, _typing.MutableMapping[int, str], _fbthrift_python_mutable_containers.MutableList[MyEnum], _fbthrift_python_mutable_containers.MutableSet[str], SimpleStruct, _fbthrift_python_mutable_containers.MutableList[SimpleStruct], MyUnion, _fbthrift_python_mutable_containers.MutableList[MyUnion], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[SimpleStruct]], _typing.MutableMapping[int, str], _typing.MutableMapping[int, int], _typing.MutableMapping[str, _typing.MutableMapping[int, MyEnum]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, int, int, int, bytes, bytes, int, int, float, float, float, _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableList[MyEnum], _fbthrift_python_mutable_containers.MutableSet[str], SimpleStruct, _fbthrift_python_mutable_containers.MutableList[SimpleStruct], MyUnion, _fbthrift_python_mutable_containers.MutableList[MyUnion], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[SimpleStruct]], _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, int], _fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableMap[int, MyEnum]]]]]: ... def _to_python(self) -> "module.thrift_types.defaultStruct": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.defaultStruct": ... # type: ignore @@ -471,15 +471,15 @@ class MyStructTypeDef(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_co myStringTypedef: str = ... @property - def myMapField(self) -> _typing.MutableMapping[int, str]: ... + def myMapField(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @myMapField.setter - def myMapField(self, value: _typing.MutableMapping[int, str]): ... + def myMapField(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def myMapTypedef(self) -> _typing.MutableMapping[int, str]: ... + def myMapTypedef(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @myMapTypedef.setter - def myMapTypedef(self, value: _typing.MutableMapping[int, str]): ... + def myMapTypedef(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property @@ -495,9 +495,9 @@ class MyStructTypeDef(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_co @property - def myMapListOfTypeDef(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]: ... + def myMapListOfTypeDef(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]: ... @myMapListOfTypeDef.setter - def myMapListOfTypeDef(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]): ... + def myMapListOfTypeDef(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, @@ -505,11 +505,11 @@ class MyStructTypeDef(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_co myLongTypeDef: _typing.Optional[int]=..., myStringField: _typing.Optional[str]=..., myStringTypedef: _typing.Optional[str]=..., - myMapField: _typing.Optional[_typing.MutableMapping[int, str]]=..., - myMapTypedef: _typing.Optional[_typing.MutableMapping[int, str]]=..., + myMapField: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + myMapTypedef: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., myListField: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[float] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., myListTypedef: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[float] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - myMapListOfTypeDef: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]=... + myMapListOfTypeDef: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( @@ -518,13 +518,13 @@ class MyStructTypeDef(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_co myLongTypeDef: _typing.Optional[int]=..., myStringField: _typing.Optional[str]=..., myStringTypedef: _typing.Optional[str]=..., - myMapField: _typing.Optional[_typing.MutableMapping[int, str]]=..., - myMapTypedef: _typing.Optional[_typing.MutableMapping[int, str]]=..., + myMapField: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + myMapTypedef: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., myListField: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[float] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., myListTypedef: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[float] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - myMapListOfTypeDef: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]=... + myMapListOfTypeDef: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, int, str, str, _typing.MutableMapping[int, str], _typing.MutableMapping[int, str], _fbthrift_python_mutable_containers.MutableList[float], _fbthrift_python_mutable_containers.MutableList[float], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, int, str, str, _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableList[float], _fbthrift_python_mutable_containers.MutableList[float], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[float]]]]]]: ... def _to_python(self) -> "module.thrift_types.MyStructTypeDef": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.MyStructTypeDef": ... # type: ignore @@ -666,81 +666,81 @@ class ComplexNestedStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrif @property - def mapStructListOfListOfLong(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]]]: ... + def mapStructListOfListOfLong(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]]]: ... @mapStructListOfListOfLong.setter - def mapStructListOfListOfLong(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]]]): ... + def mapStructListOfListOfLong(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mKeyStructValInt(self) -> _typing.MutableMapping[MyStruct, int]: ... + def mKeyStructValInt(self) -> _fbthrift_python_mutable_containers.MutableMap[MyStruct, int]: ... @mKeyStructValInt.setter - def mKeyStructValInt(self, value: _typing.MutableMapping[MyStruct, int]): ... + def mKeyStructValInt(self, value: _fbthrift_python_mutable_containers.MutableMap[MyStruct, int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def listOfMapKeyIntValInt(self) -> _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]]: ... + def listOfMapKeyIntValInt(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]: ... @listOfMapKeyIntValInt.setter - def listOfMapKeyIntValInt(self, value: _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... + def listOfMapKeyIntValInt(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... @property - def listOfMapKeyStrValList(self) -> _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[str, _fbthrift_python_mutable_containers.MutableList[MyStruct]]]: ... + def listOfMapKeyStrValList(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableList[MyStruct]]]: ... @listOfMapKeyStrValList.setter - def listOfMapKeyStrValList(self, value: _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[str, _fbthrift_python_mutable_containers.MutableList[MyStruct]]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... + def listOfMapKeyStrValList(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableList[MyStruct]]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... @property - def mapKeySetValLong(self) -> _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[int], int]: ... + def mapKeySetValLong(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int]: ... @mapKeySetValLong.setter - def mapKeySetValLong(self, value: _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[int], int]): ... + def mapKeySetValLong(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapKeyListValLong(self) -> _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[str], int]: ... + def mapKeyListValLong(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[str], int]: ... @mapKeyListValLong.setter - def mapKeyListValLong(self, value: _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[str], int]): ... + def mapKeyListValLong(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[str], int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapKeyMapValMap(self) -> _typing.MutableMapping[_typing.MutableMapping[int, str], _typing.MutableMapping[int, str]]: ... + def mapKeyMapValMap(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str]]: ... @mapKeyMapValMap.setter - def mapKeyMapValMap(self, value: _typing.MutableMapping[_typing.MutableMapping[int, str], _typing.MutableMapping[int, str]]): ... + def mapKeyMapValMap(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapKeySetValMap(self) -> _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]]: ... + def mapKeySetValMap(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]]: ... @mapKeySetValMap.setter - def mapKeySetValMap(self, value: _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]]): ... + def mapKeySetValMap(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def NestedMaps(self) -> _typing.MutableMapping[_typing.MutableMapping[_typing.MutableMapping[int, str], str], _typing.MutableMapping[int, str]]: ... + def NestedMaps(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], str], _fbthrift_python_mutable_containers.MutableMap[int, str]]: ... @NestedMaps.setter - def NestedMaps(self, value: _typing.MutableMapping[_typing.MutableMapping[_typing.MutableMapping[int, str], str], _typing.MutableMapping[int, str]]): ... + def NestedMaps(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], str], _fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapKeyIntValList(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[MyStruct]]: ... + def mapKeyIntValList(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[MyStruct]]: ... @mapKeyIntValList.setter - def mapKeyIntValList(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[MyStruct]]): ... + def mapKeyIntValList(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[MyStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapKeyIntValSet(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableSet[bool]]: ... + def mapKeyIntValSet(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[bool]]: ... @mapKeyIntValSet.setter - def mapKeyIntValSet(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableSet[bool]]): ... + def mapKeyIntValSet(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[bool]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapKeySetValInt(self) -> _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[bool], MyEnum]: ... + def mapKeySetValInt(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[bool], MyEnum]: ... @mapKeySetValInt.setter - def mapKeySetValInt(self, value: _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[bool], MyEnum]): ... + def mapKeySetValInt(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[bool], MyEnum] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def mapKeyListValSet(self) -> _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_typing.MutableMapping[float, str]]]: ... + def mapKeyListValSet(self) -> _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[float, str]]]: ... @mapKeyListValSet.setter - def mapKeyListValSet(self, value: _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_typing.MutableMapping[float, str]]]): ... + def mapKeyListValSet(self, value: _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[float, str]]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, @@ -749,19 +749,19 @@ class ComplexNestedStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrif listOfListOfMyStruct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., setOfListOfListOfLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., setOfSetOfsetOfLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - mapStructListOfListOfLong: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]]]=..., - mKeyStructValInt: _typing.Optional[_typing.MutableMapping[MyStruct, int]]=..., - listOfMapKeyIntValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - listOfMapKeyStrValList: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[str, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - mapKeySetValLong: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[int], int]]=..., - mapKeyListValLong: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[str], int]]=..., - mapKeyMapValMap: _typing.Optional[_typing.MutableMapping[_typing.MutableMapping[int, str], _typing.MutableMapping[int, str]]]=..., - mapKeySetValMap: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]]]=..., - NestedMaps: _typing.Optional[_typing.MutableMapping[_typing.MutableMapping[_typing.MutableMapping[int, str], str], _typing.MutableMapping[int, str]]]=..., - mapKeyIntValList: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]]=..., - mapKeyIntValSet: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableSet[bool]]]=..., - mapKeySetValInt: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[bool], _fbthrift_compatible_with_MyEnum]]=..., - mapKeyListValSet: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_typing.MutableMapping[float, str]]]]=... + mapStructListOfListOfLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mKeyStructValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[MyStruct, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + listOfMapKeyIntValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + listOfMapKeyStrValList: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + mapKeySetValLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyListValLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[str], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyMapValMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeySetValMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + NestedMaps: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], str], _fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyIntValList: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyIntValSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[bool]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeySetValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[bool], _fbthrift_compatible_with_MyEnum] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyListValSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[float, str]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( @@ -771,21 +771,21 @@ class ComplexNestedStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrif listOfListOfMyStruct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., setOfListOfListOfLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., setOfSetOfsetOfLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - mapStructListOfListOfLong: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]]]=..., - mKeyStructValInt: _typing.Optional[_typing.MutableMapping[MyStruct, int]]=..., - listOfMapKeyIntValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - listOfMapKeyStrValList: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[str, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - mapKeySetValLong: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[int], int]]=..., - mapKeyListValLong: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[str], int]]=..., - mapKeyMapValMap: _typing.Optional[_typing.MutableMapping[_typing.MutableMapping[int, str], _typing.MutableMapping[int, str]]]=..., - mapKeySetValMap: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]]]=..., - NestedMaps: _typing.Optional[_typing.MutableMapping[_typing.MutableMapping[_typing.MutableMapping[int, str], str], _typing.MutableMapping[int, str]]]=..., - mapKeyIntValList: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]]=..., - mapKeyIntValSet: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableSet[bool]]]=..., - mapKeySetValInt: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[bool], _fbthrift_compatible_with_MyEnum]]=..., - mapKeyListValSet: _typing.Optional[_typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_typing.MutableMapping[float, str]]]]=... + mapStructListOfListOfLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mKeyStructValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[MyStruct, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + listOfMapKeyIntValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + listOfMapKeyStrValList: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + mapKeySetValLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyListValLong: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[str], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyMapValMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeySetValMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + NestedMaps: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], str], _fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyIntValList: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyIntValSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[bool]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeySetValInt: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[bool], _fbthrift_compatible_with_MyEnum] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + mapKeyListValSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[float, str]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyEnum]]]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]]], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]]], _typing.MutableMapping[MyStruct, int], _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]], _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[str, _fbthrift_python_mutable_containers.MutableList[MyStruct]]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[int], int], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[str], int], _typing.MutableMapping[_typing.MutableMapping[int, str], _typing.MutableMapping[int, str]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]], _typing.MutableMapping[_typing.MutableMapping[_typing.MutableMapping[int, str], str], _typing.MutableMapping[int, str]], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[MyStruct]], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableSet[bool]], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableSet[bool], MyEnum], _typing.MutableMapping[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_typing.MutableMapping[float, str]]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyEnum]]]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[MyStruct]]], _fbthrift_python_mutable_containers.MutableMap[MyStruct, int], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[str, _fbthrift_python_mutable_containers.MutableList[MyStruct]]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[str], int], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[str]], str]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, str], str], _fbthrift_python_mutable_containers.MutableMap[int, str]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[MyStruct]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[bool]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[bool], MyEnum], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[float, str]]]]]]: ... def _to_python(self) -> "module.thrift_types.ComplexNestedStruct": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.ComplexNestedStruct": ... # type: ignore @@ -799,34 +799,34 @@ class _fbthrift_compatible_with_TypeRemapped: class TypeRemapped(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatible_with_TypeRemapped, module.thrift_abstract_types.TypeRemapped): @property - def lsMap(self) -> _typing.MutableMapping[int, str]: ... + def lsMap(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @lsMap.setter - def lsMap(self, value: _typing.MutableMapping[int, str]): ... + def lsMap(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def ioMap(self) -> _typing.MutableMapping[int, _typing.MutableMapping[int, int]]: ... + def ioMap(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]]: ... @ioMap.setter - def ioMap(self, value: _typing.MutableMapping[int, _typing.MutableMapping[int, int]]): ... + def ioMap(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... BigInteger: int = ... binaryTestBuffer: bytes = ... def __init__( self, *, - lsMap: _typing.Optional[_typing.MutableMapping[int, str]]=..., - ioMap: _typing.Optional[_typing.MutableMapping[int, _typing.MutableMapping[int, int]]]=..., + lsMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + ioMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., BigInteger: _typing.Optional[int]=..., binaryTestBuffer: _typing.Optional[bytes]=... ) -> None: ... def __call__( self, *, - lsMap: _typing.Optional[_typing.MutableMapping[int, str]]=..., - ioMap: _typing.Optional[_typing.MutableMapping[int, _typing.MutableMapping[int, int]]]=..., + lsMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + ioMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., BigInteger: _typing.Optional[int]=..., binaryTestBuffer: _typing.Optional[bytes]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_typing.MutableMapping[int, str], _typing.MutableMapping[int, _typing.MutableMapping[int, int]], int, bytes]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]], int, bytes]]]: ... def _to_python(self) -> "module.thrift_types.TypeRemapped": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.TypeRemapped": ... # type: ignore @@ -906,9 +906,9 @@ class complexException(_fbthrift_python_mutable_exceptions.MutableGeneratedError structError: MyStruct = ... @property - def lsMap(self) -> _typing.MutableMapping[int, str]: ... + def lsMap(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @lsMap.setter - def lsMap(self, value: _typing.MutableMapping[int, str]): ... + def lsMap(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, @@ -917,10 +917,10 @@ class complexException(_fbthrift_python_mutable_exceptions.MutableGeneratedError errorEnum: _typing.Optional[_fbthrift_compatible_with_MyEnum]=..., unionError: _typing.Optional[_fbthrift_compatible_with_MyUnion]=..., structError: _typing.Optional[_fbthrift_compatible_with_MyStruct]=..., - lsMap: _typing.Optional[_typing.MutableMapping[int, str]]=... + lsMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[str, _fbthrift_python_mutable_containers.MutableList[str], MyEnum, MyUnion, MyStruct, _typing.MutableMapping[int, str]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[str, _fbthrift_python_mutable_containers.MutableList[str], MyEnum, MyUnion, MyStruct, _fbthrift_python_mutable_containers.MutableMap[int, str]]]]: ... def _to_python(self) -> "module.thrift_types.complexException": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.complexException": ... # type: ignore @@ -939,5 +939,5 @@ floatTypedef = float FMap = _typing.Dict[int, int] binary_4918 = bytes i32_1194 = int -map_i32_FMap_6797 = _typing.Dict[int, _typing.MutableMapping[int, int]] +map_i32_FMap_6797 = _typing.Dict[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] map_i64_string_5732 = _typing.Dict[int, str] diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/complex-union/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi b/third-party/thrift/src/thrift/compiler/test/fixtures/complex-union/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi index b7c9e05cdb0290..d6e039ea2d83a4 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/complex-union/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/complex-union/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi @@ -53,9 +53,9 @@ class ComplexUnion(_fbthrift_python_mutable_types.MutableUnion, _fbthrift_compat stringValue: str = ... @property - def typedefValue(self) -> _typing.MutableMapping[int, str]: ... + def typedefValue(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @typedefValue.setter - def typedefValue(self, value: _typing.MutableMapping[int, str]): ... + def typedefValue(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... stringRef: str = ... def __init__( @@ -64,7 +64,7 @@ class ComplexUnion(_fbthrift_python_mutable_types.MutableUnion, _fbthrift_compat intListValue: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., stringListValue: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[str] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., stringValue: _typing.Optional[str]=..., - typedefValue: _typing.Optional[_typing.MutableMapping[int, str]]=..., + typedefValue: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., stringRef: _typing.Optional[str]=... ) -> None: ... @@ -78,7 +78,7 @@ class ComplexUnion(_fbthrift_python_mutable_types.MutableUnion, _fbthrift_compat typedefValue: ComplexUnion.Type = ... stringRef: ComplexUnion.Type = ... - fbthrift_current_value: _typing.Final[_typing.Union[None, int, _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[str], str, _typing.MutableMapping[int, str], str]] + fbthrift_current_value: _typing.Final[_typing.Union[None, int, _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[str], str, _fbthrift_python_mutable_containers.MutableMap[int, str], str]] fbthrift_current_field: _typing.Final[FbThriftUnionFieldEnum] def get_type(self) -> FbThriftUnionFieldEnum:... def _to_python(self) -> "module.thrift_types.ComplexUnion": ... # type: ignore @@ -162,24 +162,24 @@ class Val(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatible_wit intVal: int = ... @property - def typedefValue(self) -> _typing.MutableMapping[int, str]: ... + def typedefValue(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @typedefValue.setter - def typedefValue(self, value: _typing.MutableMapping[int, str]): ... + def typedefValue(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, strVal: _typing.Optional[str]=..., intVal: _typing.Optional[int]=..., - typedefValue: _typing.Optional[_typing.MutableMapping[int, str]]=... + typedefValue: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( self, *, strVal: _typing.Optional[str]=..., intVal: _typing.Optional[int]=..., - typedefValue: _typing.Optional[_typing.MutableMapping[int, str]]=... + typedefValue: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[str, int, _typing.MutableMapping[int, str]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[str, int, _fbthrift_python_mutable_containers.MutableMap[int, str]]]]: ... def _to_python(self) -> "module.thrift_types.Val": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.Val": ... # type: ignore diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/constants/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi b/third-party/thrift/src/thrift/compiler/test/fixtures/constants/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi index 9af8330f12022f..c946b04c6ed0b5 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/constants/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/constants/out/python_experimental_unify_thrift_python_type_hints/gen-python/module/thrift_mutable_types.pyi @@ -311,7 +311,7 @@ name: str = ... multi_line_string: str = ... -states: _typing.List[_typing.MutableMapping[str, int]] = ... +states: _typing.List[_fbthrift_python_mutable_containers.MutableMap[str, int]] = ... x: float = ... diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/python_capi/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/python_capi/module/thrift_mutable_types.pyi b/third-party/thrift/src/thrift/compiler/test/fixtures/python_capi/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/python_capi/module/thrift_mutable_types.pyi index eafed327eaea68..b15495b3a59f1a 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/python_capi/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/python_capi/module/thrift_mutable_types.pyi +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/python_capi/out/python_experimental_unify_thrift_python_type_hints/gen-python/test/fixtures/python_capi/module/thrift_mutable_types.pyi @@ -80,9 +80,9 @@ class MyStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatibl @property - def strMappy(self) -> _typing.MutableMapping[bytes, str]: ... + def strMappy(self) -> _fbthrift_python_mutable_containers.MutableMap[bytes, str]: ... @strMappy.setter - def strMappy(self, value: _typing.MutableMapping[bytes, str]): ... + def strMappy(self, value: _fbthrift_python_mutable_containers.MutableMap[bytes, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property @@ -98,7 +98,7 @@ class MyStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatibl myEnumy: _typing.Optional[_fbthrift_compatible_with_MyEnum]=..., booly: _typing.Optional[bool]=..., floatListy: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[float] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - strMappy: _typing.Optional[_typing.MutableMapping[bytes, str]]=..., + strMappy: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., intSetty: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=... ) -> None: ... @@ -110,10 +110,10 @@ class MyStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatibl myEnumy: _typing.Optional[_fbthrift_compatible_with_MyEnum]=..., booly: _typing.Optional[bool]=..., floatListy: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[float] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - strMappy: _typing.Optional[_typing.MutableMapping[bytes, str]]=..., + strMappy: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., intSetty: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, str, MyDataItem, MyEnum, bool, _fbthrift_python_mutable_containers.MutableList[float], _typing.MutableMapping[bytes, str], _fbthrift_python_mutable_containers.MutableSet[int]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[int, str, MyDataItem, MyEnum, bool, _fbthrift_python_mutable_containers.MutableList[float], _fbthrift_python_mutable_containers.MutableMap[bytes, str], _fbthrift_python_mutable_containers.MutableSet[int]]]]: ... def _to_python(self) -> "test.fixtures.python_capi.module.thrift_types.MyStruct": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "test.fixtures.python_capi.module.types.MyStruct": ... # type: ignore @@ -511,92 +511,92 @@ class _fbthrift_compatible_with_MapStruct: class MapStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatible_with_MapStruct, test.fixtures.python_capi.module.thrift_abstract_types.MapStruct): @property - def enumz(self) -> _typing.MutableMapping[MyEnum, str]: ... + def enumz(self) -> _fbthrift_python_mutable_containers.MutableMap[MyEnum, str]: ... @enumz.setter - def enumz(self, value: _typing.MutableMapping[MyEnum, str]): ... + def enumz(self, value: _fbthrift_python_mutable_containers.MutableMap[MyEnum, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def intz(self) -> _typing.Optional[_typing.MutableMapping[int, str]]: ... + def intz(self) -> _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str]]: ... @intz.setter - def intz(self, value: _typing.Optional[_typing.MutableMapping[int, str]]): ... + def intz(self, value: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def binnaz(self) -> _typing.Optional[_typing.MutableMapping[bytes, PrimitiveStruct]]: ... + def binnaz(self) -> _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, PrimitiveStruct]]: ... @binnaz.setter - def binnaz(self, value: _typing.Optional[_typing.MutableMapping[bytes, PrimitiveStruct]]): ... + def binnaz(self, value: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, PrimitiveStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def encoded(self) -> _typing.MutableMapping[str, float]: ... + def encoded(self) -> _fbthrift_python_mutable_containers.MutableMap[str, float]: ... @encoded.setter - def encoded(self, value: _typing.MutableMapping[str, float]): ... + def encoded(self, value: _fbthrift_python_mutable_containers.MutableMap[str, float] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def flotz(self) -> _typing.MutableMapping[int, float]: ... + def flotz(self) -> _fbthrift_python_mutable_containers.MutableMap[int, float]: ... @flotz.setter - def flotz(self, value: _typing.MutableMapping[int, float]): ... + def flotz(self, value: _fbthrift_python_mutable_containers.MutableMap[int, float] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def map_list(self) -> _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]]: ... + def map_list(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]: ... @map_list.setter - def map_list(self, value: _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... + def map_list(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... @property - def list_map(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]: ... + def list_map(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]]: ... @list_map.setter - def list_map(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]): ... + def list_map(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def fast_list_map(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[float]]: ... + def fast_list_map(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[float]]: ... @fast_list_map.setter - def fast_list_map(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[float]]): ... + def fast_list_map(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[float]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def buf_map(self) -> _typing.MutableMapping[bytes, _fbthrift_iobuf.IOBuf]: ... + def buf_map(self) -> _fbthrift_python_mutable_containers.MutableMap[bytes, _fbthrift_iobuf.IOBuf]: ... @buf_map.setter - def buf_map(self, value: _typing.MutableMapping[bytes, _fbthrift_iobuf.IOBuf]): ... + def buf_map(self, value: _fbthrift_python_mutable_containers.MutableMap[bytes, _fbthrift_iobuf.IOBuf] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def unsigned_list_map(self) -> _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]: ... + def unsigned_list_map(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]]: ... @unsigned_list_map.setter - def unsigned_list_map(self, value: _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]): ... + def unsigned_list_map(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, - enumz: _typing.Optional[_typing.MutableMapping[MyEnum, str]]=..., - intz: _typing.Optional[_typing.MutableMapping[int, str]]=..., - binnaz: _typing.Optional[_typing.MutableMapping[bytes, _fbthrift_compatible_with_PrimitiveStruct]]=..., - encoded: _typing.Optional[_typing.MutableMapping[str, float]]=..., - flotz: _typing.Optional[_typing.MutableMapping[int, float]]=..., - map_list: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - list_map: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]]=..., - fast_list_map: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[float]]]=..., - buf_map: _typing.Optional[_typing.MutableMapping[bytes, _fbthrift_iobuf.IOBuf]]=..., - unsigned_list_map: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]]=... + enumz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[MyEnum, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + intz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + binnaz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, _fbthrift_compatible_with_PrimitiveStruct] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + encoded: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, float] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + flotz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, float] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_list: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + fast_list_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[float]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + buf_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, _fbthrift_iobuf.IOBuf] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + unsigned_list_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( self, *, - enumz: _typing.Optional[_typing.MutableMapping[MyEnum, str]]=..., - intz: _typing.Optional[_typing.MutableMapping[int, str]]=..., - binnaz: _typing.Optional[_typing.MutableMapping[bytes, _fbthrift_compatible_with_PrimitiveStruct]]=..., - encoded: _typing.Optional[_typing.MutableMapping[str, float]]=..., - flotz: _typing.Optional[_typing.MutableMapping[int, float]]=..., - map_list: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - list_map: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]]=..., - fast_list_map: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[float]]]=..., - buf_map: _typing.Optional[_typing.MutableMapping[bytes, _fbthrift_iobuf.IOBuf]]=..., - unsigned_list_map: _typing.Optional[_typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]]=... + enumz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[MyEnum, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + intz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + binnaz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, _fbthrift_compatible_with_PrimitiveStruct] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + encoded: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, float] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + flotz: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, float] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_list: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + fast_list_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[float]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + buf_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, _fbthrift_iobuf.IOBuf] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + unsigned_list_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_typing.MutableMapping[MyEnum, str], _typing.MutableMapping[int, str], _typing.MutableMapping[bytes, PrimitiveStruct], _typing.MutableMapping[str, float], _typing.MutableMapping[int, float], _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, int]], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[float]], _typing.MutableMapping[bytes, _fbthrift_iobuf.IOBuf], _typing.MutableMapping[int, _fbthrift_python_mutable_containers.MutableList[int]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableMap[MyEnum, str], _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[bytes, PrimitiveStruct], _fbthrift_python_mutable_containers.MutableMap[str, float], _fbthrift_python_mutable_containers.MutableMap[int, float], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[float]], _fbthrift_python_mutable_containers.MutableMap[bytes, _fbthrift_iobuf.IOBuf], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]]]]]: ... def _to_python(self) -> "test.fixtures.python_capi.module.thrift_types.MapStruct": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "test.fixtures.python_capi.module.types.MapStruct": ... # type: ignore @@ -679,9 +679,9 @@ class Onion(_fbthrift_python_mutable_types.MutableUnion, _fbthrift_compatible_wi @property - def strMap(self) -> _typing.MutableMapping[bytes, str]: ... + def strMap(self) -> _fbthrift_python_mutable_containers.MutableMap[bytes, str]: ... @strMap.setter - def strMap(self, value: _typing.MutableMapping[bytes, str]): ... + def strMap(self, value: _fbthrift_python_mutable_containers.MutableMap[bytes, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... adapted_int: int = ... def __init__( @@ -691,7 +691,7 @@ class Onion(_fbthrift_python_mutable_types.MutableUnion, _fbthrift_compatible_wi myString: _typing.Optional[str]=..., intSet: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., doubleList: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[float] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., - strMap: _typing.Optional[_typing.MutableMapping[bytes, str]]=..., + strMap: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., adapted_int: _typing.Optional[int]=... ) -> None: ... @@ -706,7 +706,7 @@ class Onion(_fbthrift_python_mutable_types.MutableUnion, _fbthrift_compatible_wi strMap: Onion.Type = ... adapted_int: Onion.Type = ... - fbthrift_current_value: _typing.Final[_typing.Union[None, MyEnum, PrimitiveStruct, str, _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableList[float], _typing.MutableMapping[bytes, str], int]] + fbthrift_current_value: _typing.Final[_typing.Union[None, MyEnum, PrimitiveStruct, str, _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableList[float], _fbthrift_python_mutable_containers.MutableMap[bytes, str], int]] fbthrift_current_field: _typing.Final[FbThriftUnionFieldEnum] def get_type(self) -> FbThriftUnionFieldEnum:... def _to_python(self) -> "test.fixtures.python_capi.module.thrift_types.Onion": ... # type: ignore diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_clients.py b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_clients.py index a1056d0cf0d6bd..57691382f666f8 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_clients.py +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_clients.py @@ -59,10 +59,10 @@ def __get_metadata__() -> _fbthrift_metadata.ThriftMetadata: async def bounce_map( self, - m: _typing.MutableMapping[int, str], + m: _fbthrift_python_mutable_containers.MutableMap[int, str], *, rpc_options: _typing.Optional[RpcOptions] = None, - ) -> _typing.MutableMapping[int, str]: + ) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: _fbthrift_resp = await self._send_request( "SomeService", "bounce_map", @@ -87,7 +87,7 @@ async def binary_keyed_map( r: _fbthrift_python_mutable_containers.MutableList[int], *, rpc_options: _typing.Optional[RpcOptions] = None, - ) -> _typing.MutableMapping[bytes, int]: + ) -> _fbthrift_python_mutable_containers.MutableMap[bytes, int]: _fbthrift_resp = await self._send_request( "SomeService", "binary_keyed_map", @@ -122,10 +122,10 @@ def __get_metadata__() -> _fbthrift_metadata.ThriftMetadata: def bounce_map( self, - m: _typing.MutableMapping[int, str], + m: _fbthrift_python_mutable_containers.MutableMap[int, str], *, rpc_options: _typing.Optional[RpcOptions] = None, - ) -> _typing.MutableMapping[int, str]: + ) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: _fbthrift_resp = self._send_request( "SomeService", "bounce_map", @@ -149,7 +149,7 @@ def binary_keyed_map( r: _fbthrift_python_mutable_containers.MutableList[int], *, rpc_options: _typing.Optional[RpcOptions] = None, - ) -> _typing.MutableMapping[bytes, int]: + ) -> _fbthrift_python_mutable_containers.MutableMap[bytes, int]: _fbthrift_resp = self._send_request( "SomeService", "binary_keyed_map", diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_services.py b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_services.py index 080fa1ada39238..b4e0b0a0b98d88 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_services.py +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_services.py @@ -52,8 +52,8 @@ def __get_metadata_service_response__() -> _fbthrift_metadata.ThriftServiceMetad async def bounce_map( self, - m: _typing.MutableMapping[int, str] - ) -> _typing.MutableMapping[int, str]: + m: _fbthrift_python_mutable_containers.MutableMap[int, str] + ) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: raise NotImplementedError("async def bounce_map is not implemented") async def _fbthrift__handler_bounce_map(self, args: _fbthrift_iobuf.IOBuf, protocol: Protocol) -> _fbthrift_iobuf.IOBuf: @@ -66,7 +66,7 @@ async def _fbthrift__handler_bounce_map(self, args: _fbthrift_iobuf.IOBuf, proto async def binary_keyed_map( self, r: _fbthrift_python_mutable_containers.MutableList[int] - ) -> _typing.MutableMapping[bytes, int]: + ) -> _fbthrift_python_mutable_containers.MutableMap[bytes, int]: raise NotImplementedError("async def binary_keyed_map is not implemented") async def _fbthrift__handler_binary_keyed_map(self, args: _fbthrift_iobuf.IOBuf, protocol: Protocol) -> _fbthrift_iobuf.IOBuf: diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_types.pyi b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_types.pyi index 53cfdc3ad83737..d295f5e06762ad 100644 --- a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_types.pyi +++ b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/python_experimental_unify_thrift_python_type_hints/gen-python/apache/thrift/fixtures/types/module/thrift_mutable_types.pyi @@ -146,15 +146,15 @@ class ContainerStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_co @property - def fieldG(self) -> _typing.MutableMapping[int, str]: ... + def fieldG(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @fieldG.setter - def fieldG(self, value: _typing.MutableMapping[int, str]): ... + def fieldG(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property - def fieldH(self) -> _typing.MutableMapping[int, str]: ... + def fieldH(self) -> _fbthrift_python_mutable_containers.MutableMap[int, str]: ... @fieldH.setter - def fieldH(self, value: _typing.MutableMapping[int, str]): ... + def fieldH(self, value: _fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... @property @@ -169,8 +169,8 @@ class ContainerStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_co fieldD: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., fieldE: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., fieldF: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - fieldG: _typing.Optional[_typing.MutableMapping[int, str]]=..., - fieldH: _typing.Optional[_typing.MutableMapping[int, str]]=..., + fieldG: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + fieldH: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., fieldA: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=... ) -> None: ... @@ -181,11 +181,11 @@ class ContainerStruct(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_co fieldD: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., fieldE: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., fieldF: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - fieldG: _typing.Optional[_typing.MutableMapping[int, str]]=..., - fieldH: _typing.Optional[_typing.MutableMapping[int, str]]=..., + fieldG: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + fieldH: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., fieldA: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[int], _typing.MutableMapping[int, str], _typing.MutableMapping[int, str], _fbthrift_python_mutable_containers.MutableList[int]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableMap[int, str], _fbthrift_python_mutable_containers.MutableList[int]]]]: ... def _to_python(self) -> "apache.thrift.fixtures.types.module.thrift_types.ContainerStruct": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "apache.thrift.fixtures.types.module.types.ContainerStruct": ... # type: ignore @@ -324,22 +324,22 @@ class ComplexString(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_comp a: str = ... @property - def b(self) -> _typing.MutableMapping[str, int]: ... + def b(self) -> _fbthrift_python_mutable_containers.MutableMap[str, int]: ... @b.setter - def b(self, value: _typing.MutableMapping[str, int]): ... + def b(self, value: _fbthrift_python_mutable_containers.MutableMap[str, int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, a: _typing.Optional[str]=..., - b: _typing.Optional[_typing.MutableMapping[str, int]]=... + b: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( self, *, a: _typing.Optional[str]=..., - b: _typing.Optional[_typing.MutableMapping[str, int]]=... + b: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[str, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[str, _typing.MutableMapping[str, int]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[str, _fbthrift_python_mutable_containers.MutableMap[str, int]]]]: ... def _to_python(self) -> "apache.thrift.fixtures.types.module.thrift_types.ComplexString": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "apache.thrift.fixtures.types.module.types.ComplexString": ... # type: ignore @@ -519,22 +519,22 @@ class AnnotatedTypes(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_com binary_field: bytes = ... @property - def list_field(self) -> _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, str]]: ... + def list_field(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, str]]: ... @list_field.setter - def list_field(self, value: _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, str]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... + def list_field(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftListWrapper): ... def __init__( self, *, binary_field: _typing.Optional[bytes]=..., - list_field: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, str]] | _fbthrift_python_mutable_types._ThriftListWrapper]=... + list_field: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftListWrapper]=... ) -> None: ... def __call__( self, *, binary_field: _typing.Optional[bytes]=..., - list_field: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, str]] | _fbthrift_python_mutable_types._ThriftListWrapper]=... + list_field: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, str]] | _fbthrift_python_mutable_types._ThriftListWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[bytes, _fbthrift_python_mutable_containers.MutableList[_typing.MutableMapping[int, str]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[bytes, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, str]]]]]: ... def _to_python(self) -> "apache.thrift.fixtures.types.module.thrift_types.AnnotatedTypes": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "apache.thrift.fixtures.types.module.types.AnnotatedTypes": ... # type: ignore @@ -617,20 +617,20 @@ class _fbthrift_compatible_with_IncompleteMap: class IncompleteMap(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatible_with_IncompleteMap, apache.thrift.fixtures.types.module.thrift_abstract_types.IncompleteMap): @property - def field(self) -> _typing.Optional[_typing.MutableMapping[int, IncompleteMapDep]]: ... + def field(self) -> _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, IncompleteMapDep]]: ... @field.setter - def field(self, value: _typing.Optional[_typing.MutableMapping[int, IncompleteMapDep]]): ... + def field(self, value: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, IncompleteMapDep]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, - field: _typing.Optional[_typing.MutableMapping[int, _fbthrift_compatible_with_IncompleteMapDep]]=... + field: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_IncompleteMapDep] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( self, *, - field: _typing.Optional[_typing.MutableMapping[int, _fbthrift_compatible_with_IncompleteMapDep]]=... + field: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_IncompleteMapDep] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_typing.MutableMapping[int, IncompleteMapDep]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableMap[int, IncompleteMapDep]]]]: ... def _to_python(self) -> "apache.thrift.fixtures.types.module.thrift_types.IncompleteMap": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "apache.thrift.fixtures.types.module.types.IncompleteMap": ... # type: ignore @@ -663,20 +663,20 @@ class _fbthrift_compatible_with_CompleteMap: class CompleteMap(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compatible_with_CompleteMap, apache.thrift.fixtures.types.module.thrift_abstract_types.CompleteMap): @property - def field(self) -> _typing.Optional[_typing.MutableMapping[int, CompleteMapDep]]: ... + def field(self) -> _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, CompleteMapDep]]: ... @field.setter - def field(self, value: _typing.Optional[_typing.MutableMapping[int, CompleteMapDep]]): ... + def field(self, value: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, CompleteMapDep]] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... def __init__( self, *, - field: _typing.Optional[_typing.MutableMapping[int, _fbthrift_compatible_with_CompleteMapDep]]=... + field: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_CompleteMapDep] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( self, *, - field: _typing.Optional[_typing.MutableMapping[int, _fbthrift_compatible_with_CompleteMapDep]]=... + field: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_CompleteMapDep] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_typing.MutableMapping[int, CompleteMapDep]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableMap[int, CompleteMapDep]]]]: ... def _to_python(self) -> "apache.thrift.fixtures.types.module.thrift_types.CompleteMap": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "apache.thrift.fixtures.types.module.types.CompleteMap": ... # type: ignore @@ -911,9 +911,9 @@ class AllocatorAware(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_com @property - def aa_map(self) -> _typing.MutableMapping[int, int]: ... + def aa_map(self) -> _fbthrift_python_mutable_containers.MutableMap[int, int]: ... @aa_map.setter - def aa_map(self, value: _typing.MutableMapping[int, int]): ... + def aa_map(self, value: _fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper): ... aa_string: str = ... not_a_container: int = ... @@ -923,7 +923,7 @@ class AllocatorAware(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_com self, *, aa_list: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., aa_set: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - aa_map: _typing.Optional[_typing.MutableMapping[int, int]]=..., + aa_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., aa_string: _typing.Optional[str]=..., not_a_container: _typing.Optional[int]=..., aa_unique: _typing.Optional[int]=..., @@ -934,13 +934,13 @@ class AllocatorAware(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_com self, *, aa_list: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[int] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., aa_set: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[int] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., - aa_map: _typing.Optional[_typing.MutableMapping[int, int]]=..., + aa_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., aa_string: _typing.Optional[str]=..., not_a_container: _typing.Optional[int]=..., aa_unique: _typing.Optional[int]=..., aa_shared: _typing.Optional[int]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[int], _typing.MutableMapping[int, int], str, int, int, int]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[int], _fbthrift_python_mutable_containers.MutableSet[int], _fbthrift_python_mutable_containers.MutableMap[int, int], str, int, int, int]]]: ... def _to_python(self) -> "apache.thrift.fixtures.types.module.thrift_types.AllocatorAware": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "apache.thrift.fixtures.types.module.types.AllocatorAware": ... # type: ignore @@ -1024,7 +1024,7 @@ class StructWithDoubleUnderscores(_fbthrift_python_mutable_types.MutableStruct, TBinary = bytes IntTypedef = int UintTypedef = int -SomeListOfTypeMap_2468 = _typing.List[_typing.MutableMapping[int, str]] +SomeListOfTypeMap_2468 = _typing.List[_fbthrift_python_mutable_containers.MutableMap[int, str]] TBinary_8623 = bytes i32_9314 = int list_i32_9187 = _typing.List[int] @@ -1036,29 +1036,29 @@ string_5252 = str class _fbthrift_SomeService_bounce_map_args(_fbthrift_python_types.Struct): - m: _typing.Final[_typing.MutableMapping[int, str]] = ... + m: _typing.Final[_fbthrift_python_mutable_containers.MutableMap[int, str]] = ... def __init__( self, *, - m: _typing.Optional[_typing.MutableMapping[int, str]]=... + m: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str]]=... ) -> None: ... def __iter__(self) -> _typing.Iterator[_typing.Tuple[ str, - _typing.Union[None, _typing.MutableMapping[int, str]]]]: ... + _typing.Union[None, _fbthrift_python_mutable_containers.MutableMap[int, str]]]]: ... class _fbthrift_SomeService_bounce_map_result(_fbthrift_python_types.Struct): - success: _typing.Final[_typing.MutableMapping[int, str]] + success: _typing.Final[_fbthrift_python_mutable_containers.MutableMap[int, str]] def __init__( - self, *, success: _typing.Optional[_typing.MutableMapping[int, str]] = ... + self, *, success: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, str]] = ... ) -> None: ... def __iter__(self) -> _typing.Iterator[_typing.Tuple[ str, _typing.Union[ - _typing.MutableMapping[int, str], + _fbthrift_python_mutable_containers.MutableMap[int, str], ]]]: ... @@ -1076,14 +1076,14 @@ class _fbthrift_SomeService_binary_keyed_map_args(_fbthrift_python_types.Struct) class _fbthrift_SomeService_binary_keyed_map_result(_fbthrift_python_types.Struct): - success: _typing.Final[_typing.MutableMapping[bytes, int]] + success: _typing.Final[_fbthrift_python_mutable_containers.MutableMap[bytes, int]] def __init__( - self, *, success: _typing.Optional[_typing.MutableMapping[bytes, int]] = ... + self, *, success: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[bytes, int]] = ... ) -> None: ... def __iter__(self) -> _typing.Iterator[_typing.Tuple[ str, _typing.Union[ - _typing.MutableMapping[bytes, int], + _fbthrift_python_mutable_containers.MutableMap[bytes, int], ]]]: ...