Internal change only

PiperOrigin-RevId: 491993057
zhangskz · Nov 30, 2022 · 3d3bebf · 3d3bebf
1 parent 85debe8
commit 3d3bebf
Show file tree

Hide file tree

Showing 41 changed files with 143 additions and 136 deletions.
diff --git a/python/google/protobuf/descriptor.py b/python/google/protobuf/descriptor.py
diff --git a/python/google/protobuf/internal/api_implementation.py b/python/google/protobuf/internal/api_implementation.py
@@ -102,6 +102,7 @@ def _CanImport(mod_name):
   try:
     # pylint: disable=g-import-not-at-top
     from google.protobuf.pyext import _message
+    sys.modules['google.protobuf.internal.cpp._message'] = _message
     _c_module = _message
     del _message
   except ImportError:
@@ -151,6 +152,12 @@ def Type():
   return _implementation_type
 
 
+def _SetType(implementation_type):
+  """Never use! Only for protobuf benchmark."""
+  global _implementation_type
+  _implementation_type = implementation_type
+
+
 # See comment on 'Type' above.
 # TODO(jieluo): Remove the API, it returns a constant. b/228102101
 def Version():

diff --git a/python/google/protobuf/internal/containers.py b/python/google/protobuf/internal/containers.py
diff --git a/python/google/protobuf/internal/decoder.py b/python/google/protobuf/internal/decoder.py
diff --git a/python/google/protobuf/internal/encoder.py b/python/google/protobuf/internal/encoder.py
diff --git a/python/google/protobuf/internal/python_message.py b/python/google/protobuf/internal/python_message.py
diff --git a/python/google/protobuf/internal/python_protobuf.cc b/python/google/protobuf/internal/python_protobuf.cc
@@ -30,7 +30,7 @@
 
 // Author: qrczak@google.com (Marcin Kowalczyk)
 
-#include "google/protobuf/python/python_protobuf.h"
+#include "third_party/py/google/protobuf/python_protobuf.h"
 
 namespace google {
 namespace protobuf {

diff --git a/python/google/protobuf/internal/test_util.py b/python/google/protobuf/internal/test_util.py
@@ -49,12 +49,11 @@
   long = int  # Python 3
 
 
-# Tests whether the given TestAllTypes message is
-# protobuf_unittest.TestAllTypes or not.
+# Tests whether the given TestAllTypes message is proto2 or not.
 # This is used to gate several fields/features that only exist
-# for the protobuf_unittest version of the message.
+# for the proto2 version of the message.
 def IsProto2(message):
-  return message.DESCRIPTOR.full_name == 'protobuf_unittest.TestAllTypes'
+  return message.DESCRIPTOR.syntax == "proto2"
 
 
 def SetAllNonLazyFields(message):

diff --git a/python/google/protobuf/internal/type_checkers.py b/python/google/protobuf/internal/type_checkers.py
diff --git a/python/google/protobuf/message.py b/python/google/protobuf/message.py
diff --git a/python/google/protobuf/proto_api.h b/python/google/protobuf/proto_api.h
@@ -42,8 +42,8 @@
 // Then use the methods of the returned class:
 //    py_proto_api->GetMessagePointer(...);
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
-#define GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
@@ -141,4 +141,4 @@ inline const char* PyProtoAPICapsuleName() {
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
diff --git a/python/google/protobuf/pyext/descriptor.cc b/python/google/protobuf/pyext/descriptor.cc
@@ -30,7 +30,7 @@
 
 // Author: petar@google.com (Petar Petrov)
 
-#include "google/protobuf/pyext/descriptor.h"
+#include "third_party/py/google/protobuf/pyext/descriptor.h"
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
@@ -42,11 +42,11 @@
 
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/pyext/descriptor_containers.h"
-#include "google/protobuf/pyext/descriptor_pool.h"
-#include "google/protobuf/pyext/message.h"
-#include "google/protobuf/pyext/message_factory.h"
-#include "google/protobuf/pyext/scoped_pyobject_ptr.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_containers.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_pool.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/message_factory.h"
+#include "third_party/py/google/protobuf/pyext/scoped_pyobject_ptr.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/io/coded_stream.h"
 

diff --git a/python/google/protobuf/pyext/descriptor.h b/python/google/protobuf/pyext/descriptor.h
@@ -30,8 +30,8 @@
 
 // Author: petar@google.com (Petar Petrov)
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
@@ -102,4 +102,4 @@ bool InitDescriptor();
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
diff --git a/python/google/protobuf/pyext/descriptor_containers.cc b/python/google/protobuf/pyext/descriptor_containers.cc
@@ -56,13 +56,13 @@
 
 #include <string>
 
-#include "google/protobuf/pyext/descriptor_containers.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_containers.h"
 // clang-format on
 
 #include "google/protobuf/descriptor.h"
-#include "google/protobuf/pyext/descriptor.h"
-#include "google/protobuf/pyext/descriptor_pool.h"
-#include "google/protobuf/pyext/scoped_pyobject_ptr.h"
+#include "third_party/py/google/protobuf/pyext/descriptor.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_pool.h"
+#include "third_party/py/google/protobuf/pyext/scoped_pyobject_ptr.h"
 #include "absl/strings/string_view.h"
 
 #define PyString_AsStringAndSize(ob, charpp, sizep)              \

diff --git a/python/google/protobuf/pyext/descriptor_containers.h b/python/google/protobuf/pyext/descriptor_containers.h
@@ -28,8 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
 
 // Mappings and Sequences of descriptors.
 // They implement containers like fields_by_name, EnumDescriptor.values...
@@ -107,4 +107,4 @@ PyObject* NewServiceMethodsByName(const ServiceDescriptor* descriptor);
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
diff --git a/python/google/protobuf/pyext/descriptor_database.cc b/python/google/protobuf/pyext/descriptor_database.cc
@@ -31,7 +31,7 @@
 // This file defines a C++ DescriptorDatabase, which wraps a Python Database
 // and delegate all its operations to Python methods.
 
-#include "google/protobuf/pyext/descriptor_database.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_database.h"
 
 #include <cstdint>
 #include <string>
@@ -40,8 +40,8 @@
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/pyext/message.h"
-#include "google/protobuf/pyext/scoped_pyobject_ptr.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/scoped_pyobject_ptr.h"
 
 namespace google {
 namespace protobuf {

diff --git a/python/google/protobuf/pyext/descriptor_database.h b/python/google/protobuf/pyext/descriptor_database.h
@@ -28,8 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
@@ -83,4 +83,4 @@ class PyDescriptorDatabase : public DescriptorDatabase {
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
diff --git a/python/google/protobuf/pyext/descriptor_pool.cc b/python/google/protobuf/pyext/descriptor_pool.cc
@@ -39,13 +39,14 @@
 #include <Python.h>
 
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/pyext/descriptor.h"
-#include "google/protobuf/pyext/descriptor_database.h"
-#include "google/protobuf/pyext/descriptor_pool.h"
-#include "google/protobuf/pyext/message.h"
-#include "google/protobuf/pyext/message_factory.h"
-#include "google/protobuf/pyext/scoped_pyobject_ptr.h"
+#include "third_party/py/google/protobuf/pyext/descriptor.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_database.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_pool.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/message_factory.h"
+#include "third_party/py/google/protobuf/pyext/scoped_pyobject_ptr.h"
 #include "absl/strings/string_view.h"
+#include "absl/strings/str_replace.h"
 
 #define PyString_AsStringAndSize(ob, charpp, sizep)              \
   (PyUnicode_Check(ob)                                           \

diff --git a/python/google/protobuf/pyext/descriptor_pool.h b/python/google/protobuf/pyext/descriptor_pool.h
@@ -28,8 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
@@ -146,4 +146,4 @@ bool InitDescriptorPool();
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
diff --git a/python/google/protobuf/pyext/extension_dict.cc b/python/google/protobuf/pyext/extension_dict.cc
@@ -31,7 +31,7 @@
 // Author: anuraag@google.com (Anuraag Agrawal)
 // Author: tibell@google.com (Johan Tibell)
 
-#include "google/protobuf/pyext/extension_dict.h"
+#include "third_party/py/google/protobuf/pyext/extension_dict.h"
 
 #include <cstdint>
 #include <memory>
@@ -43,12 +43,12 @@
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/message.h"
-#include "google/protobuf/pyext/descriptor.h"
-#include "google/protobuf/pyext/message.h"
-#include "google/protobuf/pyext/message_factory.h"
-#include "google/protobuf/pyext/repeated_composite_container.h"
-#include "google/protobuf/pyext/repeated_scalar_container.h"
-#include "google/protobuf/pyext/scoped_pyobject_ptr.h"
+#include "third_party/py/google/protobuf/pyext/descriptor.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/message_factory.h"
+#include "third_party/py/google/protobuf/pyext/repeated_composite_container.h"
+#include "third_party/py/google/protobuf/pyext/repeated_scalar_container.h"
+#include "third_party/py/google/protobuf/pyext/scoped_pyobject_ptr.h"
 #include "absl/strings/string_view.h"
 
 #define PyString_AsStringAndSize(ob, charpp, sizep)              \

diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h
@@ -31,13 +31,13 @@
 // Author: anuraag@google.com (Anuraag Agrawal)
 // Author: tibell@google.com (Johan Tibell)
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
-#include "google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
 
 namespace google {
 namespace protobuf {
@@ -67,4 +67,4 @@ ExtensionDict* NewExtensionDict(CMessage *parent);
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
diff --git a/python/google/protobuf/pyext/field.cc b/python/google/protobuf/pyext/field.cc
@@ -28,11 +28,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "google/protobuf/pyext/field.h"
+#include "third_party/py/google/protobuf/pyext/field.h"
 
 #include "google/protobuf/descriptor.h"
-#include "google/protobuf/pyext/descriptor.h"
-#include "google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/descriptor.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
 
 namespace google {
 namespace protobuf {

diff --git a/python/google/protobuf/pyext/field.h b/python/google/protobuf/pyext/field.h
@@ -28,8 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
@@ -57,4 +57,4 @@ PyObject* NewFieldProperty(const FieldDescriptor* field_descriptor);
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
diff --git a/python/google/protobuf/pyext/map_container.cc b/python/google/protobuf/pyext/map_container.cc
@@ -30,7 +30,7 @@
 
 // Author: haberman@google.com (Josh Haberman)
 
-#include "google/protobuf/pyext/map_container.h"
+#include "third_party/py/google/protobuf/pyext/map_container.h"
 
 #include <cstdint>
 #include <memory>
@@ -41,10 +41,10 @@
 #include "google/protobuf/map.h"
 #include "google/protobuf/map_field.h"
 #include "google/protobuf/message.h"
-#include "google/protobuf/pyext/message.h"
-#include "google/protobuf/pyext/message_factory.h"
-#include "google/protobuf/pyext/repeated_composite_container.h"
-#include "google/protobuf/pyext/scoped_pyobject_ptr.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/message_factory.h"
+#include "third_party/py/google/protobuf/pyext/repeated_composite_container.h"
+#include "third_party/py/google/protobuf/pyext/scoped_pyobject_ptr.h"
 
 namespace google {
 namespace protobuf {

diff --git a/python/google/protobuf/pyext/map_container.h b/python/google/protobuf/pyext/map_container.h
@@ -28,8 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
+#ifndef THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
+#define THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
@@ -38,7 +38,7 @@
 
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/message.h"
-#include "google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
 
 namespace google {
 namespace protobuf {
@@ -86,4 +86,4 @@ extern MessageMapContainer* NewMessageMapContainer(
 }  // namespace protobuf
 }  // namespace google
 
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
+#endif  // THIRD_PARTY_PY_GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc
@@ -31,7 +31,7 @@
 // Author: anuraag@google.com (Anuraag Agrawal)
 // Author: tibell@google.com (Johan Tibell)
 
-#include "google/protobuf/pyext/message.h"
+#include "third_party/py/google/protobuf/pyext/message.h"
 
 #include <structmember.h>  // A Python header file.
 
@@ -57,18 +57,18 @@
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/unknown_field_set.h"
-#include "google/protobuf/pyext/descriptor.h"
-#include "google/protobuf/pyext/descriptor_pool.h"
-#include "google/protobuf/pyext/extension_dict.h"
-#include "google/protobuf/pyext/field.h"
-#include "google/protobuf/pyext/map_container.h"
-#include "google/protobuf/pyext/message_factory.h"
-#include "google/protobuf/pyext/repeated_composite_container.h"
-#include "google/protobuf/pyext/repeated_scalar_container.h"
-#include "google/protobuf/pyext/safe_numerics.h"
-#include "google/protobuf/pyext/scoped_pyobject_ptr.h"
-#include "google/protobuf/pyext/unknown_field_set.h"
-#include "google/protobuf/pyext/unknown_fields.h"
+#include "third_party/py/google/protobuf/pyext/descriptor.h"
+#include "third_party/py/google/protobuf/pyext/descriptor_pool.h"
+#include "third_party/py/google/protobuf/pyext/extension_dict.h"
+#include "third_party/py/google/protobuf/pyext/field.h"
+#include "third_party/py/google/protobuf/pyext/map_container.h"
+#include "third_party/py/google/protobuf/pyext/message_factory.h"
+#include "third_party/py/google/protobuf/pyext/repeated_composite_container.h"
+#include "third_party/py/google/protobuf/pyext/repeated_scalar_container.h"
+#include "third_party/py/google/protobuf/pyext/safe_numerics.h"
+#include "third_party/py/google/protobuf/pyext/scoped_pyobject_ptr.h"
+#include "third_party/py/google/protobuf/pyext/unknown_field_set.h"
+#include "third_party/py/google/protobuf/pyext/unknown_fields.h"
 #include "google/protobuf/util/message_differencer.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/io/coded_stream.h"