Skip to content

gh-116608: Bring back importlib.resources functional API #116609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 12 commits into from
Apr 5, 2024
Merged

gh-116608: Bring back importlib.resources functional API #116609

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bdc3209
gh-116608: Bring back importlib.resources functional API
encukou Mar 7, 2024
9b065b1
Docs fix
encukou Mar 11, 2024
265ae91
Require explicit encoding arg for ambiguous cases
encukou Mar 11, 2024
9176619
tests: Expect OSError -- we can get PermissionError instead of IsADir…
encukou Mar 12, 2024
33466da
Merge in the main branch
encukou Mar 20, 2024
56603fe
Allow separators in path segments
encukou Mar 20, 2024
4d276e0
Merge in the main branch
encukou Mar 21, 2024
a520a78
Fix issues & nitbicks found in backport
encukou Mar 21, 2024
e788bf3
PEP-8 formatting
encukou Mar 21, 2024
09c7bf7
Docs/ReST fix
encukou Mar 21, 2024
e15331c
Add a leading underscore to the module name
encukou Apr 2, 2024
de5b0d5
Merge in the main branch
encukou Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tests: Expect OSError -- we can get PermissionError instead of IsADir… 
…ectoryError
  • Loading branch information
@encukou
encukou committed Mar 12, 2024
commit 917661909d80d0368e44bf65e0cb94d17610e6f2
14 changes: 9 additions & 5 deletions Lib/test/test_importlib/resources/test_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ def test_read_text(self):
),
'a resource',
)
with self.assertRaises(IsADirectoryError):
# Use generic OSError, since e.g. attempting to read a directory can
# fail with PermissionError rather than IsADirectoryError
with self.assertRaises(OSError):
importlib.resources.read_text(self.anchor01)
with self.assertRaises(FileNotFoundError):
with self.assertRaises(OSError):
importlib.resources.read_text(self.anchor01, 'no-such-file')
with self.assertRaises(UnicodeDecodeError):
importlib.resources.read_text(self.anchor01, 'utf-16.file')
Expand Down Expand Up @@ -75,9 +77,11 @@ def test_open_text(self):
encoding='utf-8',
) as f:
self.assertEqual(f.read(), 'a resource')
with self.assertRaises(IsADirectoryError):
# Use generic OSError, since e.g. attempting to read a directory can
# fail with PermissionError rather than IsADirectoryError
with self.assertRaises(OSError):
importlib.resources.open_text(self.anchor01)
with self.assertRaises(FileNotFoundError):
with self.assertRaises(OSError):
importlib.resources.open_text(self.anchor01, 'no-such-file')
with importlib.resources.open_text(self.anchor01, 'utf-16.file') as f:
with self.assertRaises(UnicodeDecodeError):
Expand Down Expand Up @@ -128,7 +132,7 @@ def test_contents(self):
set(c),
{'utf-8.file', 'utf-16.file', 'binary.file', 'subdirectory'},
)
with (self.assertRaises(NotADirectoryError),
with (self.assertRaises(OSError),
check_warnings((".*contents.*", DeprecationWarning)),
):
importlib.resources.contents(self.anchor01, 'utf-8.file')
Expand Down