aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal/python_message.py
diff options
context:
space:
mode:
authorGravatar zex <top_zlynch@yahoo.com>2015-02-06 13:51:49 +0800
committerGravatar zex <top_zlynch@yahoo.com>2015-02-06 13:51:49 +0800
commita4f634ce749b5d870742da6a50311a626625baa1 (patch)
tree19e16eea321dd8840f1a88f43cfaa46ba2e06435 /python/google/protobuf/internal/python_message.py
parent20490e33cae8d21a2e37e4383a4f1330612be49c (diff)
fix raise syntax issues for py3,
fix except syntax issue for py3
Diffstat (limited to 'python/google/protobuf/internal/python_message.py')
-rwxr-xr-xpython/google/protobuf/internal/python_message.py4
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 6fda6ae0..86b91c8a 100755
--- a/python/google/protobuf/internal/python_message.py
+++ b/python/google/protobuf/internal/python_message.py
@@ -314,7 +314,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):
@@ -863,7 +863,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