From 03f03e7802b0842b41f70b2b1c17ab26551a7533 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 5 Nov 2023 09:43:46 -0500 Subject: [PATCH 1/4] Limit sphinxlint jobs to 1. Workaround for sphinx-contrib/sphinx-lint#83. --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 33da3de..331eeed 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,9 @@ extras = changedir = docs commands = python -m sphinx -W --keep-going . {toxinidir}/build/html - python -m sphinxlint + python -m sphinxlint \ + # workaround for sphinx-contrib/sphinx-lint#83 + --jobs 1 [testenv:finalize] description = assemble changelog and tag a release From 1496c81842b13edfb9b7511e1f56f4cb7da66f87 Mon Sep 17 00:00:00 2001 From: Alexander Shadchin Date: Mon, 6 Nov 2023 14:51:49 +0300 Subject: [PATCH 2/4] Add missed `stream` argument --- importlib_resources/simple.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/importlib_resources/simple.py b/importlib_resources/simple.py index 7770c92..96f117f 100644 --- a/importlib_resources/simple.py +++ b/importlib_resources/simple.py @@ -88,7 +88,7 @@ def is_dir(self): def open(self, mode='r', *args, **kwargs): stream = self.parent.reader.open_binary(self.name) if 'b' not in mode: - stream = io.TextIOWrapper(*args, **kwargs) + stream = io.TextIOWrapper(stream, *args, **kwargs) return stream def joinpath(self, name): From d3c726360526661da6ba8523598ab4e2c3a710b9 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 6 Nov 2023 19:41:08 -0500 Subject: [PATCH 3/4] Add news fragment. --- newsfragments/+c8cc7ec5.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/+c8cc7ec5.bugfix.rst diff --git a/newsfragments/+c8cc7ec5.bugfix.rst b/newsfragments/+c8cc7ec5.bugfix.rst new file mode 100644 index 0000000..e93d957 --- /dev/null +++ b/newsfragments/+c8cc7ec5.bugfix.rst @@ -0,0 +1 @@ +Added missed stream argument in simple.ResourceHandle. Ref python/cpython#111775. \ No newline at end of file From f625a8ab82523d595604145a90be8d58dfb57c2c Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 6 Nov 2023 19:42:12 -0500 Subject: [PATCH 4/4] Finalize --- NEWS.rst | 9 +++++++++ newsfragments/+c8cc7ec5.bugfix.rst | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 newsfragments/+c8cc7ec5.bugfix.rst diff --git a/NEWS.rst b/NEWS.rst index 83126c2..eaf5071 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,3 +1,12 @@ +v6.1.1 +====== + +Bugfixes +-------- + +- Added missed stream argument in simple.ResourceHandle. Ref python/cpython#111775. + + v6.1.0 ====== diff --git a/newsfragments/+c8cc7ec5.bugfix.rst b/newsfragments/+c8cc7ec5.bugfix.rst deleted file mode 100644 index e93d957..0000000 --- a/newsfragments/+c8cc7ec5.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Added missed stream argument in simple.ResourceHandle. Ref python/cpython#111775. \ No newline at end of file