Skip to content

Commit 2edda92

Browse files
committed
zoneinfo: improve error message for PathLike relative paths
1 parent 6dd21e9 commit 2edda92

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Lib/test/test_zoneinfo/test_zoneinfo.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,6 +1784,7 @@ def test_reset_tzpath_relative_paths(self):
17841784
("/usr/share/zoneinfo", "../relative/path",),
17851785
("path/to/somewhere", "../relative/path",),
17861786
("/usr/share/zoneinfo", "path/to/somewhere", "../relative/path",),
1787+
(pathlib.Path("path/to/somewhere"),)
17871788
]
17881789
for input_paths in bad_values:
17891790
with self.subTest(input_paths=input_paths):

Lib/zoneinfo/_tzpath.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def _parse_python_tzpath(env_var, stacklevel):
5757

5858

5959
def _get_invalid_paths_message(tzpaths):
60-
invalid_paths = (path for path in tzpaths if not os.path.isabs(path))
60+
invalid_paths = (os.fspath(path) for path in tzpaths if not os.path.isabs(path))
6161

6262
prefix = "\n "
6363
indented_str = prefix + prefix.join(invalid_paths)

0 commit comments

Comments
 (0)