mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-18 06:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix for diff kitten not working with python 3.8

Browse Source 
Fixes #2780
This commit is contained in:
Kovid Goyal
2020-06-20 19:03:45 +05:30
parent f62e2374e4
commit e07916425e
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kittens/diff/highlight.py
View File

@@ -5,6 +5,8 @@
import concurrent
import os
import re
import sys
from multiprocessing import get_context
from typing import IO, Dict, Iterable, List, Optional, Tuple, Union, cast
from pygments import highlight # type: ignore
@@ -139,7 +141,14 @@ def highlight_for_diff(path: str, aliases: Dict[str, str]) -> DiffHighlight:
def highlight_collection(collection: Collection, aliases: Optional[Dict[str, str]] = None) -> Union[str, Dict[str, DiffHighlight]]:
jobs = {}
ans: Dict[str, DiffHighlight] = {}
with concurrent.futures.ProcessPoolExecutor(max_workers=os.cpu_count()) as executor:
if sys.version_info[:2] >= (3, 7):
# On macOS as of python 3.8 the default executor is changed to spawn
# which causes failures, so use fork, which is also faster
ppe = concurrent.futures.ProcessPoolExecutor(mp_context=get_context('fork'))
else:
ppe = concurrent.futures.ProcessPoolExecutor()
with ppe as executor:
for path, item_type, other_path in collection:
if item_type != 'rename':
for p in (path, other_path):