gh-123275: Support -Xgil=1 and PYTHON_GIL=1 on non-free-threaded builds

[ZeroIntensity]

cc @godlygeek

• Issue: PYTHON_GIL=1 and -Xgil=1 should work in non-free-threading builds #123275

[colesbury]

I don't have a strong opinion about this one way or the other. This seems fine to me.

[corona10]

lgtm

[miss-islington-app]

Thanks @ZeroIntensity for the PR, and @corona10 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

[bedevere-app]

GH-123753 is a backport of this pull request to the 3.13 branch.

[corona10]

@ZeroIntensity I think that we forgot to update test code.

cpython/Lib/test/test_cmd_line.py

Lines 885 to 914 in b5aa271

	def test_python_gil(self):
	cases = [
	# (env, opt, expected, msg)
	(None, None, 'None', "no options set"),
	('0', None, '0', "PYTHON_GIL=0"),
	('1', None, '1', "PYTHON_GIL=1"),
	('1', '0', '0', "-X gil=0 overrides PYTHON_GIL=1"),
	(None, '0', '0', "-X gil=0"),
	(None, '1', '1', "-X gil=1"),
	]
	code = "import sys; print(sys.flags.gil)"
	environ = dict(os.environ)
	for env, opt, expected, msg in cases:
	with self.subTest(msg, env=env, opt=opt):
	environ.pop('PYTHON_GIL', None)
	if env is not None:
	environ['PYTHON_GIL'] = env
	extra_args = []
	if opt is not None:
	extra_args = ['-X', f'gil={opt}']
	proc = subprocess.run([sys.executable, *extra_args, '-c', code],
	stdout=subprocess.PIPE,
	stderr=subprocess.PIPE,
	text=True, env=environ)
	self.assertEqual(proc.returncode, 0, proc)
	self.assertEqual(proc.stdout.rstrip(), expected)
	self.assertEqual(proc.stderr, '')

Can you update it too?

[ZeroIntensity]

Sure, I'll submit a hotfix. Sorry about that!

[corona10]

Sure, I'll submit a hotfix. Sorry about that!

No problem, it was my fault since I approved and merged this PR without checking test code.
Thanks for the work!

[ZeroIntensity]

FWIW, that test doesn't actually run on default builds. I'll just add a new test next to it to make sure that it works.

[corona10]

FWIW, that test doesn't actually run on default builds. I'll just add a new test next to it to make sure that it works.

Yeah, I know, but we should add the test when we want to support this feature at the default build, that was what I wanted to mean :)