| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 539bc017a62f91bdf7c547b58948cb5a2f59d918 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ben Webb <ben@salilab.org> |
| 3 | Date: Thu, 12 Jul 2018 10:58:10 -0700 |
| 4 | Subject: [PATCH] Add Python 3.7 compatibility (#4862) |
| 5 | |
| 6 | Compilation of Python wrappers fails with Python 3.7 because |
| 7 | the Python folks changed their C API such that |
| 8 | PyUnicode_AsUTF8AndSize() now returns a const char* rather |
| 9 | than a char*. Add a patch to work around. Relates #4086. |
| 10 | |
| 11 | Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf.git] |
| 12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 13 | |
| 14 | --- |
| 15 | google/protobuf/pyext/descriptor.cc | 2 +- |
| 16 | google/protobuf/pyext/descriptor_containers.cc | 2 +- |
| 17 | google/protobuf/pyext/descriptor_pool.cc | 2 +- |
| 18 | google/protobuf/pyext/extension_dict.cc | 2 +- |
| 19 | google/protobuf/pyext/message.cc | 4 ++-- |
| 20 | 5 files changed, 6 insertions(+), 6 deletions(-) |
| 21 | |
| 22 | diff --git a/google/protobuf/pyext/descriptor.cc b/google/protobuf/pyext/descriptor.cc |
| 23 | index 8af0cb1..19a1c38 100644 |
| 24 | --- a/google/protobuf/pyext/descriptor.cc |
| 25 | +++ b/google/protobuf/pyext/descriptor.cc |
| 26 | @@ -56,7 +56,7 @@ |
| 27 | #endif |
| 28 | #define PyString_AsStringAndSize(ob, charpp, sizep) \ |
| 29 | (PyUnicode_Check(ob)? \ |
| 30 | - ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ |
| 31 | + ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ |
| 32 | PyBytes_AsStringAndSize(ob, (charpp), (sizep))) |
| 33 | #endif |
| 34 | |
| 35 | diff --git a/google/protobuf/pyext/descriptor_containers.cc b/google/protobuf/pyext/descriptor_containers.cc |
| 36 | index bc007f7..0153664 100644 |
| 37 | --- a/google/protobuf/pyext/descriptor_containers.cc |
| 38 | +++ b/google/protobuf/pyext/descriptor_containers.cc |
| 39 | @@ -66,7 +66,7 @@ |
| 40 | #endif |
| 41 | #define PyString_AsStringAndSize(ob, charpp, sizep) \ |
| 42 | (PyUnicode_Check(ob)? \ |
| 43 | - ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ |
| 44 | + ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ |
| 45 | PyBytes_AsStringAndSize(ob, (charpp), (sizep))) |
| 46 | #endif |
| 47 | |
| 48 | diff --git a/google/protobuf/pyext/descriptor_pool.cc b/google/protobuf/pyext/descriptor_pool.cc |
| 49 | index 95882ae..962accc 100644 |
| 50 | --- a/google/protobuf/pyext/descriptor_pool.cc |
| 51 | +++ b/google/protobuf/pyext/descriptor_pool.cc |
| 52 | @@ -48,7 +48,7 @@ |
| 53 | #endif |
| 54 | #define PyString_AsStringAndSize(ob, charpp, sizep) \ |
| 55 | (PyUnicode_Check(ob)? \ |
| 56 | - ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ |
| 57 | + ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ |
| 58 | PyBytes_AsStringAndSize(ob, (charpp), (sizep))) |
| 59 | #endif |
| 60 | |
| 61 | diff --git a/google/protobuf/pyext/extension_dict.cc b/google/protobuf/pyext/extension_dict.cc |
| 62 | index 018b5c2..174c547 100644 |
| 63 | --- a/google/protobuf/pyext/extension_dict.cc |
| 64 | +++ b/google/protobuf/pyext/extension_dict.cc |
| 65 | @@ -53,7 +53,7 @@ |
| 66 | #endif |
| 67 | #define PyString_AsStringAndSize(ob, charpp, sizep) \ |
| 68 | (PyUnicode_Check(ob)? \ |
| 69 | - ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ |
| 70 | + ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ |
| 71 | PyBytes_AsStringAndSize(ob, (charpp), (sizep))) |
| 72 | #endif |
| 73 | |
| 74 | diff --git a/google/protobuf/pyext/message.cc b/google/protobuf/pyext/message.cc |
| 75 | index 5893533..31094b7 100644 |
| 76 | --- a/google/protobuf/pyext/message.cc |
| 77 | +++ b/google/protobuf/pyext/message.cc |
| 78 | @@ -79,7 +79,7 @@ |
| 79 | (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob)) |
| 80 | #define PyString_AsStringAndSize(ob, charpp, sizep) \ |
| 81 | (PyUnicode_Check(ob)? \ |
| 82 | - ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \ |
| 83 | + ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \ |
| 84 | PyBytes_AsStringAndSize(ob, (charpp), (sizep))) |
| 85 | #endif |
| 86 | #endif |
| 87 | @@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObject* arg) { |
| 88 | return NULL; |
| 89 | } |
| 90 | #else |
| 91 | - field_name = PyUnicode_AsUTF8AndSize(arg, &size); |
| 92 | + field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size)); |
| 93 | if (!field_name) { |
| 94 | return NULL; |
| 95 | } |
| 96 | -- |
| 97 | 2.7.4 |
| 98 | |