Update for qt6 branch merge

qutebrowser · Mar 19, 2023 · 516a19c · 516a19c
1 parent 3891fa4
commit 516a19c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
@@ -60,7 +60,7 @@ def _convert_usertype_world_id(
 ) -> Union[QWebEngineScript.ScriptWorldId, int]:
     world_id_type = Union[QWebEngineScript.ScriptWorldId, int]
     if world is None:
-        world_id: world_id_type = QWebEngineScript.ApplicationWorld
+        world_id: world_id_type = QWebEngineScript.ScriptWorldId.ApplicationWorld
     elif isinstance(world, int):
         world_id = world
         if not 0 <= world_id <= qtutils.MAX_WORLD_ID:
@@ -77,9 +77,9 @@ def _convert_usertype_injection_point(
         injection_point: usertypes.InjectionPoint
 ) -> QWebEngineScript.InjectionPoint:
     return {
-        usertypes.InjectionPoint.creation: QWebEngineScript.DocumentCreation,
-        usertypes.InjectionPoint.ready: QWebEngineScript.DocumentReady,
-        usertypes.InjectionPoint.deferred: QWebEngineScript.Deferred,
+        usertypes.InjectionPoint.creation: QWebEngineScript.InjectionPoint.DocumentCreation,
+        usertypes.InjectionPoint.ready: QWebEngineScript.InjectionPoint.DocumentReady,
+        usertypes.InjectionPoint.deferred: QWebEngineScript.InjectionPoint.Deferred,
     }[injection_point]
 
 

diff --git a/qutebrowser/components/ublock_resources.py b/qutebrowser/components/ublock_resources.py
@@ -29,8 +29,7 @@
 import re
 from typing import Optional, IO, List, Dict
 
-from PyQt5.QtCore import QUrl
-
+from qutebrowser.qt.core import QUrl
 from qutebrowser.api import (
     message,
 )

diff --git a/tests/unit/components/test_ublock_resources.py b/tests/unit/components/test_ublock_resources.py
@@ -22,10 +22,9 @@
 import importlib
 import pathlib
 
-from PyQt5.QtCore import QUrl
-
 import pytest
 
+from qutebrowser.qt.core import QUrl
 from qutebrowser.components import braveadblock
 
 # I think the following needs to be written in this format for importlib.reload to have