diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2015-03-31 12:30:17 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2015-03-31 12:30:17 -0700 |
commit | 42809ef8fef9e4d76267eb21bcb8a856f10ba418 (patch) | |
tree | 79bbfa62a87a0ae269fe40b8b780f2f511dfd020 | |
parent | a56d1309e44c9516c8f9d482472a75bc6ffb7f50 (diff) | |
parent | a4f634ce749b5d870742da6a50311a626625baa1 (diff) | |
download | protobuf-42809ef8fef9e4d76267eb21bcb8a856f10ba418.tar.gz protobuf-42809ef8fef9e4d76267eb21bcb8a856f10ba418.tar.bz2 protobuf-42809ef8fef9e4d76267eb21bcb8a856f10ba418.zip |
Merge pull request #196 from Zex/master
Fix raise and except syntax issues for py3
-rwxr-xr-x | python/google/protobuf/internal/python_message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/google/protobuf/internal/python_message.py b/python/google/protobuf/internal/python_message.py index 6ad0f90d..54f584ae 100755 --- a/python/google/protobuf/internal/python_message.py +++ b/python/google/protobuf/internal/python_message.py @@ -324,7 +324,7 @@ def _ReraiseTypeErrorWithFieldName(message_name, field_name): exc = TypeError('%s for field %s.%s' % (str(exc), message_name, field_name)) # re-raise possibly-amended exception with original traceback: - raise type(exc), exc, sys.exc_info()[2] + raise type(exc)(exc, sys.exc_info()[2]) def _AddInitMethod(message_descriptor, cls): @@ -894,7 +894,7 @@ def _AddMergeFromStringMethod(message_descriptor, cls): except (IndexError, TypeError): # Now ord(buf[p:p+1]) == ord('') gets TypeError. raise message_mod.DecodeError('Truncated message.') - except struct.error, e: + except struct.error as e: raise message_mod.DecodeError(e) return length # Return this for legacy reasons. cls.MergeFromString = MergeFromString |