From 94e398fd2f97628719f5bca37e24b6a8a1628304 Mon Sep 17 00:00:00 2001
From: Matthias Metelka <62722460+kleinerpirat@users.noreply.github.com>
Date: Fri, 21 Oct 2022 01:25:16 +0200
Subject: [PATCH] Use json.dumps over pprint.format

---
 qt/aqt/browser/table/__init__.py  | 2 +-
 qt/aqt/data/qt/icons/color_svg.py | 4 +---
 qt/aqt/switch.py                  | 1 +
 qt/tools/extract_sass_vars.py     | 5 ++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/qt/aqt/browser/table/__init__.py b/qt/aqt/browser/table/__init__.py
index 2f5c85a65..c62c020ac 100644
--- a/qt/aqt/browser/table/__init__.py
+++ b/qt/aqt/browser/table/__init__.py
@@ -49,7 +49,7 @@ class CellRow:
     ) -> None:
         self.refreshed_at: float = time.time()
         self.cells: tuple[Cell, ...] = tuple(Cell(*cell) for cell in cells)
-        self.color: tuple[str, str] | None = backend_color_to_aqt_color(color)
+        self.color: dict[str, str] | None = backend_color_to_aqt_color(color)
         self.font_name: str = font_name or "arial"
         self.font_size: int = font_size if font_size > 0 else 12
 
diff --git a/qt/aqt/data/qt/icons/color_svg.py b/qt/aqt/data/qt/icons/color_svg.py
index 0bbc00f14..8f80fb2b4 100644
--- a/qt/aqt/data/qt/icons/color_svg.py
+++ b/qt/aqt/data/qt/icons/color_svg.py
@@ -44,8 +44,6 @@ with open(input_svg, "r") as f:
                 data = re.sub(r"<svg", f'<svg fill="{color[mode]}"', data, 1)
             with open(filename, "w") as f:
                 f.write(data)
-    
+
         substitute(svg_data, light_svg, "light")
         substitute(svg_data, dark_svg, "dark")
-
-
diff --git a/qt/aqt/switch.py b/qt/aqt/switch.py
index 3db3e4478..3cbf6abc3 100644
--- a/qt/aqt/switch.py
+++ b/qt/aqt/switch.py
@@ -6,6 +6,7 @@ from aqt import colors
 from aqt.qt import *
 from aqt.theme import theme_manager
 
+
 class Switch(QAbstractButton):
     """A horizontal slider to toggle between two states which can be denoted by strings and/or QIcons.
 
diff --git a/qt/tools/extract_sass_vars.py b/qt/tools/extract_sass_vars.py
index 99ce6eee3..088b5e934 100644
--- a/qt/tools/extract_sass_vars.py
+++ b/qt/tools/extract_sass_vars.py
@@ -4,7 +4,6 @@
 import json
 import re
 import sys
-import pprint
 
 # bazel genrule "srcs"
 root_vars_css = sys.argv[1]
@@ -75,7 +74,7 @@ with open(colors_py, "w") as buf:
         if not "dark" in val:
             val["dark"] = val.light
 
-        buf.write(f'{color} = {pprint.pformat(val, width=50, sort_dicts=False)}\n')
+        buf.write(re.sub(r'\"\n', '",\n', f"{color} = {json.dumps(val, indent=4)}\n"))
 
 
 with open(props_py, "w") as buf:
@@ -86,4 +85,4 @@ with open(props_py, "w") as buf:
         if not "dark" in val:
             val["dark"] = val.light
 
-        buf.write(f'{prop} = {pprint.pformat(val, width=50, sort_dicts=False)}\n')
+        buf.write(re.sub(r'\"\n', '",\n', f"{prop} = {json.dumps(val, indent=4)}\n"))