GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bpo-46541: Remove usage of _Py_IDENTIFIER from lzma module by corona10 · Pull Request #31683 · python/cpython

bpo-46541: Remove usage of _Py_IDENTIFIER from lzma module #31683

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.

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

Merged

corona10 merged 1 commit into python:main from corona10:bpo-46430-lzma

Mar 4, 2022

Uh oh!

There was an error while loading. Please reload this page.

Merged

bpo-46541: Remove usage of _Py_IDENTIFIER from lzma module #31683

Changes from all commits

Commits

Show all changes

1 commit

Select commit

332d17f

bpo-46541: Remove usage of _Py_IDENTIFIER from lzma module

corona10 Mar 4, 2022

File filter

Filter by extension .c (1) All 1 file type selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

There was an error while loading. Please reload this page.

Jump to

Jump to file

Failed to load files.

Uh oh!

There was an error while loading. Please reload this page.

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

There are no files selected for viewing

20 changes: 10 additions & 10 deletions 20 Modules/_lzmamodule.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,6 @@
		*/

		#define PY_SSIZE_T_CLEAN
		#define NEEDS_PY_IDENTIFIER

		#include "Python.h"
		#include "structmember.h" // PyMemberDef
Expand Down Expand Up		@@ -431,17 +430,19 @@ parse_filter_chain_spec(_lzma_state state, lzma_filter filters[], PyObject fil
		Python-level filter specifiers (represented as dicts). */

		static int
		spec_add_field(PyObject spec, _Py_Identifier key, unsigned long long value)
		spec_add_field(PyObject spec, const char key, unsigned long long value)
		{
		int status;
		PyObject *value_object;

		value_object = PyLong_FromUnsignedLongLong(value);
		PyObject *value_object = PyLong_FromUnsignedLongLong(value);
		if (value_object == NULL) {
		return -1;
		}

		status = _PyDict_SetItemId(spec, key, value_object);
		PyObject *key_object = PyUnicode_InternFromString(key);
		if (key_object == NULL) {
		Py_DECREF(value_object);
		return -1;
		}
		int status = PyDict_SetItem(spec, key_object, value_object);
		Py_DECREF(key_object);
		Py_DECREF(value_object);
		return status;
		}
Expand All		@@ -458,8 +459,7 @@ build_filter_spec(const lzma_filter *f)

		#define ADD_FIELD(SOURCE, FIELD) \
		do { \
		_Py_IDENTIFIER(FIELD); \
		if (spec_add_field(spec, &PyId_##FIELD, SOURCE->FIELD) == -1) \
		if (spec_add_field(spec, #FIELD, SOURCE->FIELD) == -1) \
		goto error;\
		} while (0)

Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.