gh-98414: py.exe launcher does not use defaults for -V:company/ option (GH-98460)

zooba · web-flow · commit 4bd63f66cd4f · 2022-10-19T23:00:09.000+01:00
diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
@@ -369,6 +369,13 @@ def test_filter_to_company(self):
         self.assertEqual(company, data["env.company"])
         self.assertEqual("3.100", data["env.tag"])
 
+    def test_filter_to_company_with_default(self):
+        company = "PythonTestSuite"
+        data = self.run_py([f"-V:{company}/"], env=dict(PY_PYTHON="3.0"))
+        self.assertEqual("X.Y.exe", data["LaunchCommand"])
+        self.assertEqual(company, data["env.company"])
+        self.assertEqual("3.100", data["env.tag"])
+
     def test_filter_to_tag(self):
         company = "PythonTestSuite"
         data = self.run_py([f"-V:3.100"])
diff --git a/Misc/NEWS.d/next/Windows/2022-10-19-19-35-37.gh-issue-98414.FbHZuS.rst b/Misc/NEWS.d/next/Windows/2022-10-19-19-35-37.gh-issue-98414.FbHZuS.rst
@@ -0,0 +1,3 @@
+Fix :file:`py.exe` launcher handling of ``-V:<company>/`` option when
+default preferences have been set in environment variables or configuration
+files.
diff --git a/PC/launcher2.c b/PC/launcher2.c
@@ -653,6 +653,7 @@ parseCommandLine(SearchInfo *search)
                     search->tag = argStart;
                 }
                 search->tagLength = (int)(tail - search->tag);
+                search->allowDefaults = false;
                 search->restOfCmdLine = tail;
             } else if (MATCHES(L"0") || MATCHES(L"-list")) {
                 search->list = true;

Original file line number	Diff line number	Diff 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.`
Original file line number	Diff line number	Diff line change
`@@ -653,6 +653,7 @@ parseCommandLine(SearchInfo *search)`
`653`	`653`	`search->tag = argStart;`
`654`	`654`	`}`
`655`	`655`	`search->tagLength = (int)(tail - search->tag);`
	`656`	`+ search->allowDefaults = false;`
`656`	`657`	`search->restOfCmdLine = tail;`
`657`	`658`	`} else if (MATCHES(L"0") \|\| MATCHES(L"-list")) {`
`658`	`659`	`search->list = true;`