Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

spawnv_passfds expects byte args in python 3.11

Browse Source
This commit is contained in:
Kovid Goyal 2023-10-01 12:46:55 +05:30
parent f45bda394b
commit b7fd0dde65
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/startup.py
View File

@ -105,13 +105,18 @@ def initialize_calibre():
spawn.get_command_line = get_command_line spawn.get_command_line = get_command_line
orig_spawn_passfds = util.spawnv_passfds orig_spawn_passfds = util.spawnv_passfds
def wrapped_orig_spawn_fds(args, passfds):
# as of python 3.11 util.spawnv_passfds expects bytes args
args = [x.encode('utf-8') if isinstance(x, str) else x for x in args]
return orig_spawn_passfds(args[0], args, passfds)
def spawnv_passfds(path, args, passfds): def spawnv_passfds(path, args, passfds):
try: try:
idx = args.index('-c') idx = args.index('-c')
except ValueError: except ValueError:
return orig_spawn_passfds(args[0], args, passfds) return wrapped_orig_spawn_fds(args, passfds)
patched_args = get_debug_executable() + ['--fix-multiprocessing', '--'] + args[idx + 1:] patched_args = get_debug_executable() + ['--fix-multiprocessing', '--'] + args[idx + 1:]
return orig_spawn_passfds(patched_args[0], patched_args, passfds) return wrapped_orig_spawn_fds(patched_args, passfds)
util.spawnv_passfds = spawnv_passfds util.spawnv_passfds = spawnv_passfds
# #