Skip to content

Commit 4bd63f6

Browse files
authored
gh-98414: py.exe launcher does not use defaults for -V:company/ option (GH-98460)
1 parent 9c8dde0 commit 4bd63f6

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

Lib/test/test_launcher.py

+7
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,13 @@ def test_filter_to_company(self):
369369
self.assertEqual(company, data["env.company"])
370370
self.assertEqual("3.100", data["env.tag"])
371371

372+
def test_filter_to_company_with_default(self):
373+
company = "PythonTestSuite"
374+
data = self.run_py([f"-V:{company}/"], env=dict(PY_PYTHON="3.0"))
375+
self.assertEqual("X.Y.exe", data["LaunchCommand"])
376+
self.assertEqual(company, data["env.company"])
377+
self.assertEqual("3.100", data["env.tag"])
378+
372379
def test_filter_to_tag(self):
373380
company = "PythonTestSuite"
374381
data = self.run_py([f"-V:3.100"])
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix :file:`py.exe` launcher handling of ``-V:<company>/`` option when
2+
default preferences have been set in environment variables or configuration
3+
files.

PC/launcher2.c

+1
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ parseCommandLine(SearchInfo *search)
653653
search->tag = argStart;
654654
}
655655
search->tagLength = (int)(tail - search->tag);
656+
search->allowDefaults = false;
656657
search->restOfCmdLine = tail;
657658
} else if (MATCHES(L"0") || MATCHES(L"-list")) {
658659
search->list = true;

0 commit comments

Comments
 (0)