Skip to content

Breaking Change: Remove deprecated UseDeprecatedLegacyJsonFieldConflicts() #24902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −15
Draft

Breaking Change: Remove deprecated UseDeprecatedLegacyJsonFieldConflicts() #24902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions python/google/protobuf/pyext/descriptor_pool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ static PyDescriptorPool* PyDescriptorPool_NewWithUnderlay(
}

static PyDescriptorPool* PyDescriptorPool_NewWithDatabase(
DescriptorDatabase* database,
bool use_deprecated_legacy_json_field_conflicts) {
DescriptorDatabase* database) {
PyDescriptorPool* cpool = _CreateDescriptorPool();
if (cpool == nullptr) {
return nullptr;
Expand All @@ -164,11 +163,6 @@ static PyDescriptorPool* PyDescriptorPool_NewWithDatabase(
pool = new DescriptorPool();
cpool->is_mutable = true;
}
if (use_deprecated_legacy_json_field_conflicts) {
PROTOBUF_IGNORE_DEPRECATION_START
pool->UseDeprecatedLegacyJsonFieldConflicts();
PROTOBUF_IGNORE_DEPRECATION_STOP
}
cpool->pool = pool;
cpool->is_owned = true;

Expand All @@ -188,7 +182,6 @@ static PyDescriptorPool* PyDescriptorPool_NewWithDatabase(
// The public DescriptorPool constructor.
static PyObject* New(PyTypeObject* type,
PyObject* args, PyObject* kwargs) {
int use_deprecated_legacy_json_field_conflicts = 0;
static const char* kwlist[] = {"descriptor_db", nullptr};
PyObject* py_database = nullptr;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O",
Expand All @@ -200,7 +193,7 @@ static PyObject* New(PyTypeObject* type,
database = new PyDescriptorDatabase(py_database);
}
return reinterpret_cast<PyObject*>(PyDescriptorPool_NewWithDatabase(
database, use_deprecated_legacy_json_field_conflicts));
database));
}

static void Dealloc(PyObject* pself) {
Expand Down
6 changes: 0 additions & 6 deletions src/google/protobuf/descriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2459,12 +2459,6 @@ class PROTOBUF_EXPORT DescriptorPool {
// Disallow [enforce_utf8 = false] in .proto files.
void DisallowEnforceUtf8() { disallow_enforce_utf8_ = true; }

// Use the deprecated legacy behavior for handling JSON field name conflicts.
ABSL_DEPRECATED("Deprecated treatment of field name conflicts is enabled.")
void UseDeprecatedLegacyJsonFieldConflicts() {
deprecated_legacy_json_field_conflicts_ = true;
}


// For internal use only: Gets a non-const pointer to the generated pool.
// This is called at static-initialization time only, so thread-safety is
Expand Down
Loading