Skip to content

[3.8] bpo-35975: Only use cf_feature_version if PyCF_ONLY_AST in cf_flags #21023

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

Merged
gvanrossum merged 5 commits into from
Jun 28, 2020
Merged

[3.8] bpo-35975: Only use cf_feature_version if PyCF_ONLY_AST in cf_flags #21023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05e8a55
[3.8] bpo-35975: Only use cf_feature_version if PyCF_ONLY_AST in cf_f…
gvanrossum Jun 21, 2020
2235257
Add blurb
gvanrossum Jun 21, 2020
1311ec7
Add test by Stefan Behnel
gvanrossum Jun 21, 2020
4d7dabd
Remove 3.9 feature from test
gvanrossum Jun 21, 2020
858dc88
Tweak blurb per Victor's request
gvanrossum Jun 22, 2020
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
20 changes: 20 additions & 0 deletions Lib/test/test_capi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,26 @@ def test_subinterps(self):
self.assertNotEqual(pickle.load(f), id(sys.modules))
self.assertNotEqual(pickle.load(f), id(builtins))

def test_subinterps_recent_language_features(self):
r, w = os.pipe()
code = """if 1:
import pickle
with open({:d}, "wb") as f:

def noop(x): return x

a = (b := f'1{{2}}3') + noop('x') # Py 3.8 (:=) / 3.6 (f'')

async def foo(arg): return await arg # Py 3.5

pickle.dump(dict(a=a, b=b), f)
""".format(w)

with open(r, "rb") as f:
ret = support.run_in_subinterp(code)
self.assertEqual(ret, 0)
self.assertEqual(pickle.load(f), {'a': '123x', 'b': '123'})

def test_mutate_exception(self):
"""
Exceptions saved in global module state get shared between
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2020-06-20-17-21-07.bpo-35975.UDHCHp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Stefan Behnel reported that cf_feature_version is used even when
PyCF_ONLY_AST is not set. This is against the intention and against the
documented behavior, so it's been fixed.
4 changes: 3 additions & 1 deletion Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3345,6 +3345,8 @@ run_in_subinterp(PyObject *self, PyObject *args)
const char *code;
int r;
PyThreadState *substate, *mainstate;
/* only initialise 'cflags.cf_flags' to test backwards compatibility */
PyCompilerFlags cflags = {0};

if (!PyArg_ParseTuple(args, "s:run_in_subinterp",
&code))
Expand All @@ -3363,7 +3365,7 @@ run_in_subinterp(PyObject *self, PyObject *args)
PyErr_SetString(PyExc_RuntimeError, "sub-interpreter creation failed");
return NULL;
}
r = PyRun_SimpleString(code);
r = PyRun_SimpleStringFlags(code, &cflags);
Py_EndInterpreter(substate);

PyThreadState_Swap(mainstate);
Expand Down
3 changes: 2 additions & 1 deletion Python/ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,8 @@ PyAST_FromNodeObject(const node *n, PyCompilerFlags *flags,
/* borrowed reference */
c.c_filename = filename;
c.c_normalize = NULL;
c.c_feature_version = flags ? flags->cf_feature_version : PY_MINOR_VERSION;
c.c_feature_version = flags && (flags->cf_flags & PyCF_ONLY_AST) ?
flags->cf_feature_version : PY_MINOR_VERSION;

if (TYPE(n) == encoding_decl)
n = CHILD(n, 0);
Expand Down
2 changes: 1 addition & 1 deletion Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@ PyParser_ASTFromStringObject(const char *s, PyObject *filename, int start,
PyCompilerFlags localflags = _PyCompilerFlags_INIT;
perrdetail err;
int iflags = PARSER_FLAGS(flags);
if (flags && flags->cf_feature_version < 7)
if (flags && (flags->cf_flags & PyCF_ONLY_AST) && flags->cf_feature_version < 7)
iflags |= PyPARSE_ASYNC_HACKS;

node *n = PyParser_ParseStringObject(s, filename,
Expand Down