diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2015-08-12 10:46:23 -0400 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2015-08-22 12:54:31 -0400 |
| commit | 322d8939fc8043d3b2e2a1399447c2af84547396 (patch) | |
| tree | 732613ebeabf0c0cc8946b563a48e0a76bd0aac4 /python | |
| parent | 3ff5625231107957286b0cae82a9e760074bf2ee (diff) | |
| download | protobuf-322d8939fc8043d3b2e2a1399447c2af84547396.tar.gz protobuf-322d8939fc8043d3b2e2a1399447c2af84547396.tar.bz2 protobuf-322d8939fc8043d3b2e2a1399447c2af84547396.zip | |
Remove Python 2.5 cruft
Diffstat (limited to 'python')
| -rw-r--r-- | python/google/protobuf/descriptor_pool.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/python/google/protobuf/descriptor_pool.py b/python/google/protobuf/descriptor_pool.py index 1244ba7c..a6a886c3 100644 --- a/python/google/protobuf/descriptor_pool.py +++ b/python/google/protobuf/descriptor_pool.py @@ -192,8 +192,7 @@ class DescriptorPool(object): try: file_proto = self._internal_db.FindFileByName(file_name) - except KeyError: - _, error, _ = sys.exc_info() #PY25 compatible for GAE. + except KeyError as error: if self._descriptor_db: file_proto = self._descriptor_db.FindFileByName(file_name) else: @@ -228,8 +227,7 @@ class DescriptorPool(object): try: file_proto = self._internal_db.FindFileContainingSymbol(symbol) - except KeyError: - _, error, _ = sys.exc_info() #PY25 compatible for GAE. + except KeyError as error: if self._descriptor_db: file_proto = self._descriptor_db.FindFileContainingSymbol(symbol) else: |