diff options
| author | Colin Cross <ccross@android.com> | 2019-08-13 18:26:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-08-24 14:09:43 -0700 |
| commit | 86b2128317bf27f964e1ed7396bfba1d00c2f6c9 (patch) | |
| tree | e36cd8f11ed469ce2f02f515df5cd4862e494a4d /python/mox.py | |
| parent | f2d938171b98af445e6525930ac3528c80663dbd (diff) | |
| download | protobuf-86b2128317bf27f964e1ed7396bfba1d00c2f6c9.tar.gz | |
Re-apply merge of tag v3.5.2
v3.5.2 was previously merged in Ia1b9174f7e3ac5c2d86ea7370d5c6c3ef1a37300
and then reverted as part of Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337,
which leaves v3.5.2 in the history but v3.0.0-beta3 in the tree. Reapply
the merge to v3.5.2 so that v3.9.1 can be merged on top of it.
Bug: 117607748
Test: m checkbuild
Change-Id: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
Diffstat (limited to 'python/mox.py')
| -rwxr-xr-x | python/mox.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/mox.py b/python/mox.py index 257468e52..43db02191 100755 --- a/python/mox.py +++ b/python/mox.py @@ -778,7 +778,7 @@ class Comparator: rhs: any python object """ - raise NotImplementedError, 'method must be implemented by a subclass.' + raise NotImplementedError('method must be implemented by a subclass.') def __eq__(self, rhs): return self.equals(rhs) |