From b41cc1d0fc36fbd8c5ba306c22abf1cd498f9ae0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 25 May 2024 13:12:49 +0200
Subject: [PATCH] Syntax simplifications

- Drop trailing comma inside trivial tuple
- Use r"""...""" for string containing ", as \" inside r"..." is taken literally
  (I'm surprised it works!)
- Use ['"] instead of ('|")
- Also adjust the inner [^'] to [^'"] for consistency
---
 qutebrowser/utils/version.py             |  2 +-
 tests/unit/utils/usertypes/test_timer.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 7955bc558..7e15bf77e 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -486,7 +486,7 @@ def _pdfjs_version() -> str:
     else:
         pdfjs_file = pdfjs_file.decode('utf-8')
         version_re = re.compile(
-            r"^ *(PDFJS\.version|(var|const) pdfjsVersion) = ('|\")(?P<version>[^']+)('|\");$",
+            r"""^ *(PDFJS\.version|(var|const) pdfjsVersion) = ['"](?P<version>[^'"]+)['"];$""",
             re.MULTILINE)
 
         match = version_re.search(pdfjs_file)
diff --git a/tests/unit/utils/usertypes/test_timer.py b/tests/unit/utils/usertypes/test_timer.py
index 0793c826f..6aabc8c04 100644
--- a/tests/unit/utils/usertypes/test_timer.py
+++ b/tests/unit/utils/usertypes/test_timer.py
@@ -71,13 +71,13 @@ def test_timeout_set_interval(qtbot):
 
 
 @pytest.mark.parametrize(
-    "elapsed_ms,expected",
+    "elapsed_ms, expected",
     [
-        (0, False,),
-        (1, False,),
-        (600, True,),
-        (999, True,),
-        (1000, True,),
+        (0, False),
+        (1, False),
+        (600, True),
+        (999, True),
+        (1000, True),
     ],
 )
 def test_early_timeout_check(qtbot, mocker, elapsed_ms, expected):