◐ Shell
reader mode source ↗
Skip to content

bpo-32096: Remove obj and mem from _PyRuntime#4532

Merged
vstinner merged 7 commits into
python:masterfrom
vstinner:pymem_revert
Nov 24, 2017
Merged

bpo-32096: Remove obj and mem from _PyRuntime#4532
vstinner merged 7 commits into
python:masterfrom
vstinner:pymem_revert

Conversation

@vstinner

@vstinner vstinner commented Nov 23, 2017 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

bpo-32096, bpo-30860: Partially revert the commit
2ebc5ce:

  • Move structures back from Include/internal/mem.h to
    Objects/obmalloc.c
  • Remove _PyObject_Initialize() and _PyMem_Initialize()
  • Remove Include/internal/pymalloc.h

PyMem_RawMalloc() and Py_DecodeLocale() can be called again before
_PyRuntimeState_Init().

https://bugs.python.org/issue32096

@vstinner
bpo-32096: Remove obj and mem from _PyRuntime …
4ecbfaa 
bpo-32096, bpo-30860:  Partially revert the commit
2ebc5ce:

* Move structures back from Include/internal/mem.h to
  Objects/obmalloc.c
* Remove _PyObject_Initialize() and _PyMem_Initialize()
* Remove Include/internal/pymalloc.h

PyMem_RawMalloc() and Py_DecodeLocale() can be called again before
_PyRuntimeState_Init().
ncoghlan
ncoghlan previously requested changes Nov 24, 2017
View reviewed changes

@ncoghlan ncoghlan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

While I'm +1 for this reversion, it should have a NEWS entry, since it's reverting changes that were published in previous alpha releases.

It should also incorporate @ericsnowcurrently's new test case from https://github.com/python/cpython/pull/4495/files#diff-559231a69a7d7f06ab48269b3bfa1f45, to confirm that it actually is fixing the regression it's intended to fix.

@bedevere-bot

bedevere-bot commented Nov 24, 2017

Copy link
Copy Markdown

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

vstinner and others added 3 commits November 24, 2017 01:08
@vstinner
Fix _PyMem_GetDefaultRawAllocator()
f606f65
@vstinner
Add NEWS entry
bcec97f
@vstinner @ericsnowcurrently
Add test_capi.test_pre_initialization_api() …
55953b6 
Make sure that it's possible to call Py_DecodeLocale(), and then call
Py_SetProgramName() with the decoded string, before Py_Initialize().

Co-Authored-By: Eric Snow <ericsnowcurrently@gmail.com>
@vstinner vstinner dismissed ncoghlan’s stale review November 24, 2017 00:19

I added the NEWS entry and copied Eric's unit test

ncoghlan
ncoghlan approved these changes Nov 24, 2017
View reviewed changes

@ncoghlan ncoghlan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

LGTM, thanks!

@vstinner vstinner requested a review from a team as a code owner November 24, 2017 10:39
@vstinner vstinner merged commit 9e87e77 into python:master Nov 24, 2017
@vstinner vstinner deleted the pymem_revert branch November 24, 2017 11:09
This was referenced Nov 24, 2017
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ncoghlan ncoghlan ncoghlan approved these changes

@ericsnowcurrently ericsnowcurrently

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@vstinner @bedevere-bot @ncoghlan @Mariatta @the-knights-who-say-ni