Skip to content

Commit

Permalink
Merge pull request #9647 from pytest-dev/backport-9609-to-7.0.x
Browse files Browse the repository at this point in the history
[7.0.x] importlib.readers not valid until python 3.10
  • Loading branch information
bluetech committed Feb 8, 2022
2 parents 048a10b + c588a47 commit 462a6f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions changelog/9608.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix invalid importing of ``importlib.readers`` in Python 3.9.
10 changes: 6 additions & 4 deletions src/_pytest/assertion/rewrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,15 @@ def get_data(self, pathname: Union[str, bytes]) -> bytes:
with open(pathname, "rb") as f:
return f.read()

if sys.version_info >= (3, 9):
if sys.version_info >= (3, 10):

def get_resource_reader(self, name: str) -> importlib.abc.TraversableResources: # type: ignore
from types import SimpleNamespace
from importlib.readers import FileReader
if sys.version_info < (3, 11):
from importlib.readers import FileReader
else:
from importlib.resources.readers import FileReader

return FileReader(SimpleNamespace(path=self._rewritten_names[name]))
return FileReader(types.SimpleNamespace(path=self._rewritten_names[name]))


def _write_pyc_fp(
Expand Down

0 comments on commit 462a6f0

Please sign in to comment.