Skip to content

Commit 5091afc

Browse files
generatedunixname89002005232357meta-codesync[bot]
authored andcommitted
Revert D116538124
Summary: This diff reverts D116538124 This diff is automatically reverted by Releng Autopilot on behalf of the [testinfra](https://www.internalfb.com/omh/view/testinfra) oncall. It was identified as the direct cause of test [py:adapter_for_tests-type-checking - unmanaged](https://www.internalfb.com/intern/test/844425253222223/) breakage. [Debug the issue here](https://www.internalfb.com/release/automation/lens/issue?fbid=2159643544899017). If you believe D116538124 was reverted in error, create a task for [testinfra](https://www.internalfb.com/omh/view/testinfra) oncall To re-apply your diff, unland the revert diff generated by the BouncyCastle automation. Warning: You must resolve the identified error before re-applying your diff, or provide compelling evidence that it is unrelated to your change. Depends on D116538124 Reviewed By: createdbysk Differential Revision: D116591364 fbshipit-source-id: bdb8b83698e077a8d0370a269e897e258872f5de
1 parent 52a2fcc commit 5091afc

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

third-party/thrift/src/thrift/lib/python/types.pyi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ class EnumFormatAsInt:
200200
def __format__(self, format_spec: str) -> str: ...
201201

202202
class Flag(Enum):
203+
# pyre-ignore[14]: pyre incorrectly conflates this with `__contains__` from `enum.EnumMeta`
203204
def __contains__(self: eT, other: eT) -> bool: ...
205+
# pyre-ignore[15]: pyre incorrectly conflates this with general `|` overload from `type`
204206
def __or__(self: eT, other: eT) -> eT: ...
205207
def __and__(self: eT, other: eT) -> eT: ...
206208
def __xor__(self: eT, other: eT) -> eT: ...
@@ -258,6 +260,7 @@ class ImmutableSet(Container, typing.AbstractSet[ElemT]):
258260
) -> typing.AbstractSet[ElemT]: ...
259261
# pyre-ignore[15]: pyre incorrectly conflates this with general `|` overload from `type`
260262
def __or__(self, other: typing.AbstractSet[ElemT]) -> typing.Self: ...
263+
# pyre-ignore[15]: pyre incorrectly conflates this with general `|` overload from `type`
261264
def __ror__(
262265
self, other: typing.AbstractSet[ElemT]
263266
) -> typing.AbstractSet[ElemT]: ...

third-party/thrift/src/thrift/test/py/adapter_for_tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ def from_thrift(thrift_value):
3333
# pyre-fixme[3]: Return type must be annotated.
3434
# pyre-fixme[2]: Parameter must be annotated.
3535
def to_thrift(py_value):
36+
# pyre-fixme[16]: Module `thrift.test.py` has no attribute `adapter_bar`.
3637
return Bar(**py_value)

0 commit comments

Comments
 (0)