AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add EnumTypeWrapper.__getattr__ to access values (#5234)

Browse Source
This commit is contained in:
Oliver Bristow 2019-02-28 00:39:51 +00:00 committed by Jie Luo
parent 05e81cb8f4
commit 0de6577b7d
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/google/protobuf/internal/enum_type_wrapper.py
View File

@ -87,3 +87,9 @@ class EnumTypeWrapper(object):
"""
return [(value_descriptor.name, value_descriptor.number)
for value_descriptor in self._enum_type.values]
def __getattr__(self, name):
"""Returns the value coresponding to the given enum name."""
if name in self._enum_type.values_by_name:
return self._enum_type.values_by_name[name].number
raise AttributeError

34
python/google/protobuf/internal/reflection_test.py
View File

@ -804,30 +804,64 @@ class ReflectionTest(BaseTestCase):
def testEnum_Value(self):
self.assertEqual(unittest_pb2.FOREIGN_FOO,
unittest_pb2.ForeignEnum.Value('FOREIGN_FOO'))
self.assertEqual(unittest_pb2.FOREIGN_FOO,
unittest_pb2.ForeignEnum.FOREIGN_FOO)
self.assertEqual(unittest_pb2.FOREIGN_BAR,
unittest_pb2.ForeignEnum.Value('FOREIGN_BAR'))
self.assertEqual(unittest_pb2.FOREIGN_BAR,
unittest_pb2.ForeignEnum.FOREIGN_BAR)
self.assertEqual(unittest_pb2.FOREIGN_BAZ,
unittest_pb2.ForeignEnum.Value('FOREIGN_BAZ'))
self.assertEqual(unittest_pb2.FOREIGN_BAZ,
unittest_pb2.ForeignEnum.FOREIGN_BAZ)
self.assertRaises(ValueError,
unittest_pb2.ForeignEnum.Value, 'FO')
with self.assertRaises(AttributeError):
unittest_pb2.ForeignEnum.FO
proto = unittest_pb2.TestAllTypes()
self.assertEqual(proto.FOO,
proto.NestedEnum.Value('FOO'))
self.assertEqual(proto.FOO,
proto.NestedEnum.FOO)
self.assertEqual(proto.FOO,
unittest_pb2.TestAllTypes.NestedEnum.Value('FOO'))
self.assertEqual(proto.FOO,
unittest_pb2.TestAllTypes.NestedEnum.FOO)
self.assertEqual(proto.BAR,
proto.NestedEnum.Value('BAR'))
self.assertEqual(proto.BAR,
proto.NestedEnum.BAR)
self.assertEqual(proto.BAR,
unittest_pb2.TestAllTypes.NestedEnum.Value('BAR'))
self.assertEqual(proto.BAR,
unittest_pb2.TestAllTypes.NestedEnum.BAR)
self.assertEqual(proto.BAZ,
proto.NestedEnum.Value('BAZ'))
self.assertEqual(proto.BAZ,
proto.NestedEnum.BAZ)
self.assertEqual(proto.BAZ,
unittest_pb2.TestAllTypes.NestedEnum.Value('BAZ'))
self.assertEqual(proto.BAZ,
unittest_pb2.TestAllTypes.NestedEnum.BAZ)
self.assertRaises(ValueError,
proto.NestedEnum.Value, 'Foo')
with self.assertRaises(AttributeError):
proto.NestedEnum.Value.Foo
self.assertRaises(ValueError,
unittest_pb2.TestAllTypes.NestedEnum.Value, 'Foo')
with self.assertRaises(AttributeError):
unittest_pb2.TestAllTypes.NestedEnum.Value.Foo
def testEnum_KeysAndValues(self):
self.assertEqual(['FOREIGN_FOO', 'FOREIGN_BAR', 'FOREIGN_BAZ'],