Skip to content
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.

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

Remove more_itertools.more from vendored libs (fixes pypa/setuptools#3090) #3091

Merged
merged 6 commits into from
Feb 8, 2022
Merged
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
4 changes: 4 additions & 0 deletions changelog.d/3091.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Make ``concurrent.futures`` import lazy in vendored ``more_itertools``
package to a avoid importing threading as a side effect (which caused
`gevent/gevent#1865 <https://github.com/gevent/gevent/issues/1865>`__).
-- by :user:`maciejp-ro`
3 changes: 1 addition & 2 deletions pkg_resources/_vendor/more_itertools/more.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from collections import Counter, defaultdict, deque, abc
from collections.abc import Sequence
from concurrent.futures import ThreadPoolExecutor
from functools import partial, reduce, wraps
from heapq import merge, heapify, heapreplace, heappop
from itertools import (
Expand Down Expand Up @@ -3656,7 +3655,7 @@ def __init__(self, func, callback_kwd='callback', wait_seconds=0.1):
self._aborted = False
self._future = None
self._wait_seconds = wait_seconds
self._executor = ThreadPoolExecutor(max_workers=1)
self._executor = __import__("concurrent.futures").futures.ThreadPoolExecutor(max_workers=1)
self._iterator = self._reader()

def __enter__(self):
Expand Down
3 changes: 1 addition & 2 deletions setuptools/_vendor/more_itertools/more.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from collections import Counter, defaultdict, deque, abc
from collections.abc import Sequence
from concurrent.futures import ThreadPoolExecutor
from functools import partial, reduce, wraps
from heapq import merge, heapify, heapreplace, heappop
from itertools import (
Expand Down Expand Up @@ -3454,7 +3453,7 @@ def __init__(self, func, callback_kwd='callback', wait_seconds=0.1):
self._aborted = False
self._future = None
self._wait_seconds = wait_seconds
self._executor = ThreadPoolExecutor(max_workers=1)
self._executor = __import__("concurrent.futures").futures.ThreadPoolExecutor(max_workers=1)
self._iterator = self._reader()

def __enter__(self):
Expand Down
17 changes: 17 additions & 0 deletions tools/vendored.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,21 @@ def rewrite_importlib_resources(pkg_files, new_root):
file.write_text(text)


def rewrite_more_itertools(pkg_files: Path):
"""
Defer import of concurrent.futures. Workaround for #3090.
"""
more_file = pkg_files.joinpath('more.py')
text = more_file.read_text()
text = re.sub(r'^.*concurrent.futures.*?\n', '', text, flags=re.MULTILINE)
text = re.sub(
'ThreadPoolExecutor',
'__import__("concurrent.futures").futures.ThreadPoolExecutor',
text,
)
more_file.write_text(text)


def clean(vendor):
"""
Remove all files out of the vendor directory except the meta
Expand Down Expand Up @@ -96,6 +111,7 @@ def update_pkg_resources():
rewrite_jaraco_text(vendor / 'jaraco/text', 'pkg_resources.extern')
rewrite_jaraco(vendor / 'jaraco', 'pkg_resources.extern')
rewrite_importlib_resources(vendor / 'importlib_resources', 'pkg_resources.extern')
rewrite_more_itertools(vendor / "more_itertools")


def update_setuptools():
Expand All @@ -105,6 +121,7 @@ def update_setuptools():
rewrite_jaraco_text(vendor / 'jaraco/text', 'setuptools.extern')
rewrite_jaraco(vendor / 'jaraco', 'setuptools.extern')
rewrite_importlib_resources(vendor / 'importlib_resources', 'setuptools.extern')
rewrite_more_itertools(vendor / "more_itertools")


__name__ == '__main__' and update_vendored()