diff options
| author | Colin Cross <ccross@android.com> | 2018-11-04 17:34:26 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-11-04 17:36:28 -0800 |
| commit | 11fb7aeddd6ff7229bcf0834017f8091f97d7edb (patch) | |
| tree | c6efd4099d63806180b2310de5c9ea81c2f1e26e /python/mox.py | |
| parent | 584979bf55601bd23e533d704a75cd0e95af66b9 (diff) | |
| download | protobuf-11fb7aeddd6ff7229bcf0834017f8091f97d7edb.tar.gz | |
Revert "Merge changes from topic "protobuf3.5.2""
This reverts commit 584979bf55601bd23e533d704a75cd0e95af66b9, reversing
changes made to 219bbcdcd5b1dbf19758ff2e75d971b98215896d:
Remove libprotobuf-java-lite
Update stubs
Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
Update javamicro to compile against v3.5.2
Update Android.bp to match BUILD
Rerun configure
Merge tag 'v3.5.2' into master
Revert "Remove 2 usage of isspace as they are not stl port compatible"
Revert "Use GOOGLE_CHECK Macro for validation"
Revert "Emit macros with proper parentheses."
Revert "Generate syntactically correct java for imports from classes with no packages."
Revert "Fix some unused parameter warnings"
Revert "protobuf: work around a static analyzer bug"
Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."
Change-Id: Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337
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 43db02191..257468e52 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) |