diff options
| author |  Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
| commit | 814685ca2cd9280ca401e1842fd6311440921a0a (patch) | |
| tree | 5c2cac2b5ba07fe345fdda74c270b32c8f7b9331 /python/google/protobuf/internal/generator_test.py | |
| parent | 3ffbdd712f0413ce4964d626c5e10533f1f74893 (diff) | |
| parent | 3c4ce528c63f4dc39d15de963020472980ee7229 (diff) | |
Merge pull request #1397 from google/internal-merge
Internal merge
Diffstat (limited to 'python/google/protobuf/internal/generator_test.py')
| -rwxr-xr-x | python/google/protobuf/internal/generator_test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/generator_test.py b/python/google/protobuf/internal/generator_test.py index 9956da59..83ea5f50 100755 --- a/python/google/protobuf/internal/generator_test.py +++ b/python/google/protobuf/internal/generator_test.py @@ -42,9 +42,10 @@ further ensures that we can use Python protocol message objects as we expect. __author__ = 'robinson@google.com (Will Robinson)' try: - import unittest2 as unittest + import unittest2 as unittest #PY26 except ImportError: import unittest + from google.protobuf.internal import test_bad_identifiers_pb2 from google.protobuf import unittest_custom_options_pb2 from google.protobuf import unittest_import_pb2 |