NotificationsYou must be signed in to change notification settings
Fork33.7k
Star70.4k

Commit64bde50

authored

GH-102537: Handle check for PYTHONTZPATH failing in zoneinfo test (GH-102538)

It is possible but unlikely for the `python_tzpath_context` function to fail between the start of the `try` block and the point where `os.environ.get` succeeds, in which case `old_env` will be undefined. In this case, we want to take no action.Practically speaking this will really only happen in an error condition anyway, so it doesn't really matter, but we should probably do it right anyway.

1 parent53dceb5 commit64bde50Copy full SHA for 64bde50

File tree

2 files changed

+10

-1

lines changed

Lib/test/test_zoneinfo
- test_zoneinfo.py
Misc/NEWS.d/next/Tests
- 2023-03-08-13-54-20.gh-issue-102537.Vfplpb.rst

2 files changed

+10

-1

lines changed

`‎Lib/test/test_zoneinfo/test_zoneinfo.py‎`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1543,13 +1543,20 @@ class TzPathTest(TzPathUserMixin, ZoneInfoTestBase):`
`1543`	`1543`	`@contextlib.contextmanager`
`1544`	`1544`	`defpython_tzpath_context(value):`
`1545`	`1545`	`path_var="PYTHONTZPATH"`
	`1546`	`+unset_env_sentinel=object()`
	`1547`	`+old_env=unset_env_sentinel`
`1546`	`1548`	`try:`
`1547`	`1549`	`withOS_ENV_LOCK:`
`1548`	`1550`	`old_env=os.environ.get(path_var,None)`
`1549`	`1551`	`os.environ[path_var]=value`
`1550`	`1552`	`yield`
`1551`	`1553`	`finally:`
`1552`		`-ifold_envisNone:`
	`1554`	`+ifold_envisunset_env_sentinel:`
	`1555`	+# In this case, `old_env` was never retrieved from the
	`1556`	`+# environment for whatever reason, so there's no need to`
	`1557`	`+# reset the environment TZPATH.`
	`1558`	`+pass`
	`1559`	`+elifold_envisNone:`
`1553`	`1560`	`delos.environ[path_var]`
`1554`	`1561`	`else:`
`1555`	`1562`	`os.environ[path_var]=old_env# pragma: nocover`

`‎Misc/NEWS.d/next/Tests/2023-03-08-13-54-20.gh-issue-102537.Vfplpb.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Adjust the error handling strategy in`
	`2`	+``test_zoneinfo.TzPathTest.python_tzpath_context``. Patch by Paul Ganssle.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit64bde50

File tree

2 files changed

2 files changed

`‎Lib/test/test_zoneinfo/test_zoneinfo.py‎`

`‎Misc/NEWS.d/next/Tests/2023-03-08-13-54-20.gh-issue-102537.Vfplpb.rst‎`

0 commit comments