aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal
diff options
context:
space:
mode:
authorGravatar Dan O'Reilly <oreilldf@gmail.com>2015-08-14 16:16:00 -0400
committerGravatar Dan O'Reilly <oreilldf@gmail.com>2015-08-14 16:16:00 -0400
commitd06adbd4a48c83aa8e9085e988020ad3bff43211 (patch)
tree606a83467a53c1c82cb414a7d8ebd15bf1251651 /python/google/protobuf/internal
parent3d5aa6aef97f7ba9394f226778fdba91a9f89d59 (diff)
Fix usage of assertItemsEqual on Py3
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'python/google/protobuf/internal')
-rwxr-xr-xpython/google/protobuf/internal/generator_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/google/protobuf/internal/generator_test.py b/python/google/protobuf/internal/generator_test.py
index cc67f19f..f6135fb9 100755
--- a/python/google/protobuf/internal/generator_test.py
+++ b/python/google/protobuf/internal/generator_test.py
@@ -291,9 +291,9 @@ class GeneratorTest(unittest.TestCase):
self.assertIs(desc.oneofs[0], desc.oneofs_by_name['oneof_field'])
nested_names = set(['oneof_uint32', 'oneof_nested_message',
'oneof_string', 'oneof_bytes'])
- self.assertItemsEqual(
+ self.assertEqual(
nested_names,
- [field.name for field in desc.oneofs[0].fields])
+ set([field.name for field in desc.oneofs[0].fields]))
for field_name, field_desc in desc.fields_by_name.items():
if field_name in nested_names:
self.assertIs(desc.oneofs[0], field_desc.containing_oneof)