[PATCH] settings: convert found editors, terminals, and gpg to str (fixes #5803)

[Matt Harbison]

# HG changeset patch
# User Matt Harbison <matt_h...@yahoo.com>
# Date 1657579609 14400
# Mon Jul 11 18:46:49 2022 -0400
# Branch stable
# Node ID 215a8403674b5523340a87246626f4086b0c051a
# Parent 7d64976e909bf1add8956e870588d046956d60e5
settings: convert found editors, terminals, and gpg to str (fixes #5803)

diff --git a/tortoisehg/hgqt/settings.py b/tortoisehg/hgqt/settings.py
--- a/tortoisehg/hgqt/settings.py
+++ b/tortoisehg/hgqt/settings.py
@@ -600,13 +600,13 @@
return [hglib.tounicode(t) for t in hglib.mergetools(hglib.loadui())]

def findEditors():
- return editor.findeditors(hglib.loadui())
+ return [hglib.tounicode(e) for e in editor.findeditors(hglib.loadui())]

def findTerminals():
- return terminal.findterminals(hglib.loadui())
+ return [hglib.tounicode(t) for t in terminal.findterminals(hglib.loadui())]

def findGpg():
- return gpg.findgpg(hglib.loadui())
+ return [hglib.tounicode(t) for t in gpg.findgpg(hglib.loadui())]

def genCheckBox(opts):
opts['nohist'] = True

[Yuya Nishihara]

On Mon, 11 Jul 2022 23:23:04 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_h...@yahoo.com>
> # Date 1657579609 14400
> # Mon Jul 11 18:46:49 2022 -0400
> # Branch stable
> # Node ID 215a8403674b5523340a87246626f4086b0c051a
> # Parent 7d64976e909bf1add8956e870588d046956d60e5
> settings: convert found editors, terminals, and gpg to str (fixes #5803)

Queued for stable, thanks.