Skip to content

Commit 7f4fbb5

Browse files
committed
Merge pull request #268 from python/feature/future-is-here
2 parents 1f0a098 + f5af908 commit 7f4fbb5

File tree

3 files changed

+58
-4
lines changed

3 files changed

+58
-4
lines changed

CHANGES.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
v5.12.0
2+
=======
3+
4+
* #257: ``importlib_resources`` (backport) now gives
5+
precedence to built-in readers (file system, zip,
6+
namespace packages), providing forward-compatibility
7+
of behaviors like ``MultiplexedPath``.
8+
19
v5.11.1
210
=======
311

importlib_resources/_compat.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ def _file_reader(spec):
7272
return readers.FileReader(self)
7373

7474
return (
75-
# native reader if it supplies 'files'
76-
_native_reader(self.spec)
77-
or
7875
# local ZipReader if a zip module
7976
_zip_reader(self.spec)
8077
or
@@ -83,8 +80,12 @@ def _file_reader(spec):
8380
or
8481
# local FileReader
8582
_file_reader(self.spec)
83+
or
84+
# native reader if it supplies 'files'
85+
_native_reader(self.spec)
86+
or
8687
# fallback - adapt the spec ResourceReader to TraversableReader
87-
or _adapters.CompatibilityFiles(self.spec)
88+
_adapters.CompatibilityFiles(self.spec)
8889
)
8990

9091

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import unittest
2+
import contextlib
3+
import pathlib
4+
5+
import importlib_resources as resources
6+
from ..abc import TraversableResources, ResourceReader
7+
from . import util
8+
from ._compat import os_helper
9+
10+
11+
class SimpleLoader:
12+
"""
13+
A simple loader that only implements a resource reader.
14+
"""
15+
16+
def __init__(self, reader: ResourceReader):
17+
self.reader = reader
18+
19+
def get_resource_reader(self, package):
20+
return self.reader
21+
22+
23+
class MagicResources(TraversableResources):
24+
"""
25+
Magically returns the resources at path.
26+
"""
27+
28+
def __init__(self, path: pathlib.Path):
29+
self.path = path
30+
31+
def files(self):
32+
return self.path
33+
34+
35+
class CustomTraversableResourcesTests(unittest.TestCase):
36+
def setUp(self):
37+
self.fixtures = contextlib.ExitStack()
38+
self.addCleanup(self.fixtures.close)
39+
40+
def test_custom_loader(self):
41+
temp_dir = self.fixtures.enter_context(os_helper.temp_dir())
42+
loader = SimpleLoader(MagicResources(temp_dir))
43+
pkg = util.create_package_from_loader(loader)
44+
files = resources.files(pkg)
45+
assert files is temp_dir

0 commit comments

Comments
 (0)