Skip to content

Commit

Permalink
gh-98414: py.exe launcher does not use defaults for -V:company/ option (
Browse files Browse the repository at this point in the history
  • Loading branch information
zooba authored Oct 19, 2022
1 parent 9c8dde0 commit 4bd63f6
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Lib/test/test_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions PC/launcher2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4bd63f6

Please sign in to comment.