Replace pkg_resources.parse_version by QVersionNumber

Partially addresses #4667.
Supersedes #5768, #5852, #5893
See #5495

1 files changed, 7 insertions, 1 deletions

diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 7c2bf843d..851de4250 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -38,7 +38,7 @@ import ctypes
 import ctypes.util
 from typing import Any, Callable, IO, Iterator, Optional, Sequence, Tuple, Type, Union
 
-from PyQt5.QtCore import QUrl
+from PyQt5.QtCore import QUrl, QVersionNumber
 from PyQt5.QtGui import QColor, QClipboard, QDesktopServices
 from PyQt5.QtWidgets import QApplication
 import pkg_resources
@@ -210,6 +210,12 @@ def resource_filename(filename: str) -> str:
     return pkg_resources.resource_filename(qutebrowser.__name__, filename)
 
 
+def parse_version(version: str) -> QVersionNumber:
+    """Parse a version string."""
+    v_q, _suffix = QVersionNumber.fromString(version)
+    return v_q.normalized()
+
+
 def _get_color_percentage(x1: int, y1: int, z1: int, a1: int,
                           x2: int, y2: int, z2: int, a2: int,
                           percent: int) -> Tuple[int, int, int, int]: