Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions Lib/importlib/resources/simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,18 @@ class ResourceContainer(Traversable):
def __init__(self, reader: SimpleReader):
self.reader = reader

@property
def name(self):
return self.reader.name

def is_dir(self):
return True

def is_file(self):
return False

def iterdir(self):
files = (ResourceHandle(self, name) for name in self.reader.resources)
files = (ResourceHandle(self, name) for name in self.reader.resources())
dirs = map(ResourceContainer, self.reader.children())
return itertools.chain(files, dirs)

Expand All @@ -85,13 +89,18 @@ def is_file(self):
def is_dir(self):
return False

def iterdir(self):
return iter([])

def open(self, mode='r', *args, **kwargs):
stream = self.parent.reader.open_binary(self.name)
if 'b' not in mode:
stream = io.TextIOWrapper(stream, *args, **kwargs)
return stream

def joinpath(self, name):
def joinpath(self, *descendants):
if not descendants:
return self
raise RuntimeError("Cannot traverse into a resource")


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Fix ``ResourceContainer`` and ``ResourceHandle`` in
``importlib.resources.simple`` being uninstantiable due to missing ``name``
property required by :class:`~importlib.resources.abc.Traversable`. Also fix
``ResourceContainer.iterdir()`` not calling ``resources()`` and
``ResourceHandle.joinpath`` signature mismatch with base class.
Loading