AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fixed Python extension compile.

Browse Source
This commit is contained in:
Josh Haberman 2018-09-07 13:07:20 -07:00
parent f14064184c
commit e53be9bce4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/google/protobuf/pyext/message.cc
View File

@ -644,7 +644,7 @@ void OutOfRangeError(PyObject* arg) {
template<class RangeType, class ValueType> template<class RangeType, class ValueType>
bool VerifyIntegerCastAndRange(PyObject* arg, ValueType value) { bool VerifyIntegerCastAndRange(PyObject* arg, ValueType value) {
if (ABSL_PREDICT_FALSE(value == -1 && PyErr_Occurred())) { if (PROTOBUF_PREDICT_FALSE(value == -1 && PyErr_Occurred())) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) { if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
// Replace it with the same ValueError as pure python protos instead of // Replace it with the same ValueError as pure python protos instead of
// the default one. // the default one.
@ -653,7 +653,7 @@ bool VerifyIntegerCastAndRange(PyObject* arg, ValueType value) {
} // Otherwise propagate existing error. } // Otherwise propagate existing error.
return false; return false;
} }
if (ABSL_PREDICT_FALSE(!IsValidNumericCast<RangeType>(value))) { if (PROTOBUF_PREDICT_FALSE(!IsValidNumericCast<RangeType>(value))) {
OutOfRangeError(arg); OutOfRangeError(arg);
return false; return false;
} }
@ -680,7 +680,7 @@ bool CheckAndGetInteger(PyObject* arg, T* value) {
// an integer and can be used as an ordinal number". // an integer and can be used as an ordinal number".
// This definition includes everything that implements numbers.Integral // This definition includes everything that implements numbers.Integral
// and shouldn't cast the net too wide. // and shouldn't cast the net too wide.
if (ABSL_PREDICT_FALSE(!PyIndex_Check(arg))) { if (PROTOBUF_PREDICT_FALSE(!PyIndex_Check(arg))) {
FormatTypeError(arg, "int, long"); FormatTypeError(arg, "int, long");
return false; return false;
} }
@ -697,7 +697,7 @@ bool CheckAndGetInteger(PyObject* arg, T* value) {
// Unlike PyLong_AsLongLong, PyLong_AsUnsignedLongLong is very // Unlike PyLong_AsLongLong, PyLong_AsUnsignedLongLong is very
// picky about the exact type. // picky about the exact type.
PyObject* casted = PyNumber_Long(arg); PyObject* casted = PyNumber_Long(arg);
if (ABSL_PREDICT_FALSE(casted == nullptr)) { if (PROTOBUF_PREDICT_FALSE(casted == nullptr)) {
// Propagate existing error. // Propagate existing error.
return false; return false;
} }
@ -722,7 +722,7 @@ bool CheckAndGetInteger(PyObject* arg, T* value) {
// Valid subclasses of numbers.Integral should have a __long__() method // Valid subclasses of numbers.Integral should have a __long__() method
// so fall back to that. // so fall back to that.
PyObject* casted = PyNumber_Long(arg); PyObject* casted = PyNumber_Long(arg);
if (ABSL_PREDICT_FALSE(casted == nullptr)) { if (PROTOBUF_PREDICT_FALSE(casted == nullptr)) {
// Propagate existing error. // Propagate existing error.
return false; return false;
} }
@ -748,7 +748,7 @@ template bool CheckAndGetInteger<uint64>(PyObject*, uint64*);
bool CheckAndGetDouble(PyObject* arg, double* value) { bool CheckAndGetDouble(PyObject* arg, double* value) {
*value = PyFloat_AsDouble(arg); *value = PyFloat_AsDouble(arg);
if (ABSL_PREDICT_FALSE(*value == -1 && PyErr_Occurred())) { if (PROTOBUF_PREDICT_FALSE(*value == -1 && PyErr_Occurred())) {
FormatTypeError(arg, "int, long, float"); FormatTypeError(arg, "int, long, float");
return false; return false;
} }

2
python/google/protobuf/pyext/message_module.cc
View File

@ -31,7 +31,7 @@
#include <Python.h> #include <Python.h>
#include <google/protobuf/pyext/message.h> #include <google/protobuf/pyext/message.h>
#include <google/protobuf/python/proto_api.h> #include <google/protobuf/proto_api.h>
#include <google/protobuf/message_lite.h> #include <google/protobuf/message_lite.h>