diff options
| author | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
| commit | aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5 (patch) | |
| tree | f7ce45e0922c46eecd01a36afb6d8ec5a71c8155 /python/google/protobuf/internal/symbol_database_test.py | |
| parent | 452e2b2c5c607ab5d63cd813793f1aa960f19d1c (diff) | |
| parent | 7630a83767dcee42d12bac68021f53aeb3d288f8 (diff) | |
| download | protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.gz protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.bz2 protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.zip | |
Merge pull request #1381 from pherl/internal-merge
Merge Google internal changes to an internal branch
Diffstat (limited to 'python/google/protobuf/internal/symbol_database_test.py')
| -rw-r--r-- | python/google/protobuf/internal/symbol_database_test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/symbol_database_test.py b/python/google/protobuf/internal/symbol_database_test.py index 0cb935a8..c99b426d 100644 --- a/python/google/protobuf/internal/symbol_database_test.py +++ b/python/google/protobuf/internal/symbol_database_test.py @@ -33,9 +33,10 @@ """Tests for google.protobuf.symbol_database.""" try: - import unittest2 as unittest + import unittest2 as unittest #PY26 except ImportError: import unittest + from google.protobuf import unittest_pb2 from google.protobuf import descriptor from google.protobuf import symbol_database |