diff --git a/python/google/protobuf/internal/enum_type_wrapper.py b/python/google/protobuf/internal/enum_type_wrapper.py index da7d559a351cb..cc65fc0bc865d 100644 --- a/python/google/protobuf/internal/enum_type_wrapper.py +++ b/python/google/protobuf/internal/enum_type_wrapper.py @@ -99,7 +99,3 @@ def __getattr__(self, name): pass # fall out to break exception chaining raise AttributeError('Enum {} has no value defined for name {!r}'.format( self._enum_type.name, name)) - - def __or__(self, other): - """Returns the union type of self and other.""" - return type(self) | other diff --git a/python/google/protobuf/internal/enum_type_wrapper_test.py b/python/google/protobuf/internal/enum_type_wrapper_test.py deleted file mode 100644 index 623408aabd983..0000000000000 --- a/python/google/protobuf/internal/enum_type_wrapper_test.py +++ /dev/null @@ -1,39 +0,0 @@ -# Protocol Buffers - Google's data interchange format -# Copyright 2008 Google Inc. All rights reserved. -# -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file or at -# https://developers.google.com/open-source/licenses/bsd -"""Tests for EnumTypeWrapper.""" - -__author__ = "kmonte@google.com (Kyle Montemayor)" - -import types -import unittest - -from google.protobuf.internal import enum_type_wrapper - -from google.protobuf import unittest_pb2 - - -class EnumTypeWrapperTest(unittest.TestCase): - - def test_type_union(self): - enum_type = enum_type_wrapper.EnumTypeWrapper( - unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR - ) - union_type = enum_type | int - self.assertIsInstance(union_type, types.UnionType) - - def get_union() -> union_type: - return enum_type - - union = get_union() - self.assertIsInstance(union, enum_type_wrapper.EnumTypeWrapper) - self.assertEqual( - union.DESCRIPTOR, unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR - ) - - -if __name__ == "__main__": - unittest.main()