From 1c9d4e77dfc36c2df766738f2a3afde7ca3c7024 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 12 Nov 2025 08:32:11 +0100
Subject: [PATCH] Fix webconfig import

Fixes 78f71971cb7 (fix: Python 3.5+ compatibility in webconfig.py
type hints, 2025-11-09).
Fixes #12053
---
 CHANGELOG.rst                       | 6 +++++-
 share/tools/web_config/webconfig.py | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9771e4e72..7f4bf2c93 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,10 @@
-fish ?.?.? (released ???)
+fish 4.2.1 (released ???)
 =========================
 
+This release fixes the following problems identified in 4.2.0:
+
+- ``fish_config``'s theme selector (the "colors" tab) was broken, which has been fixed (:issue:`12053`).
+
 fish 4.2.0 (released November 10, 2025)
 =======================================
 
diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index d93d44eb8..6e6d47e90 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -19,7 +19,7 @@ import subprocess
 import sys
 import tempfile
 import threading
-import typing
+from typing import Optional
 from itertools import chain
 
 COMMON_WSL_CMD_PATHS = (