Commitfc12762

authored and

committed

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

(cherry picked from commit4bd63f6)Co-authored-by: Steve Dower <steve.dower@python.org>

1 parent585c95d commitfc12762Copy full SHA for fc12762

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,13 @@ def test_filter_to_company(self):`
`370`	`370`	`self.assertEqual(company,data["env.company"])`
`371`	`371`	`self.assertEqual("3.100",data["env.tag"])`
`372`	`372`
	`373`	`+deftest_filter_to_company_with_default(self):`
	`374`	`+company="PythonTestSuite"`
	`375`	`+data=self.run_py([f"-V:{company}/"],env=dict(PY_PYTHON="3.0"))`
	`376`	`+self.assertEqual("X.Y.exe",data["LaunchCommand"])`
	`377`	`+self.assertEqual(company,data["env.company"])`
	`378`	`+self.assertEqual("3.100",data["env.tag"])`
	`379`	`+`
`373`	`380`	`deftest_filter_to_tag(self):`
`374`	`381`	`company="PythonTestSuite"`
`375`	`382`	`data=self.run_py([f"-V:3.100"])`

Lines changed: 3 additions & 0 deletions

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.`

Lines changed: 1 addition & 0 deletions

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`	`}elseif (MATCHES(L"0")\|\|MATCHES(L"-list")) {`
`658`	`659`	`search->list= true;`

Comments

(0)