Fix test_discovered_page

Tribler · Jan 30, 2023 · 30801e7 · 30801e7
1 parent 518a1d1
commit 30801e7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/src/tribler/gui/network/request.py b/src/tribler/gui/network/request.py
@@ -3,7 +3,7 @@
 import json
 import logging
 from time import time
-from typing import Callable, Dict, Optional, TYPE_CHECKING, Union
+from typing import Callable, Dict, List, Optional, TYPE_CHECKING, Union
 from urllib.parse import urlencode
 
 from PyQt5.QtCore import QObject, pyqtSignal
@@ -14,6 +14,8 @@
 if TYPE_CHECKING:
     from tribler.gui.network.request_manager import RequestManager
 
+DATA_TYPE = Optional[Union[bytes, str, Dict, List]]
+
 
 class Request(QObject):
     GET = 'GET'
@@ -34,7 +36,7 @@ def __init__(
             endpoint: str,
             on_finish: Callable = lambda _: None,
             url_params: Optional[Dict] = None,
-            data: Optional[Union[bytes, str, Dict]] = None,
+            data: DATA_TYPE = None,
             method: str = GET,
             capture_errors: bool = True,
             priority=QNetworkRequest.NormalPriority,
@@ -51,7 +53,7 @@ def __init__(
         self.capture_errors = capture_errors
         self.raw_response = raw_response
         self.data = data
-        if isinstance(data, Dict):
+        if isinstance(data, Dict) or isinstance(data, List):
             raw_data = json.dumps(data).encode('utf8')
         elif isinstance(data, str):
             raw_data = data.encode('utf8')

diff --git a/src/tribler/gui/network/request_manager.py b/src/tribler/gui/network/request_manager.py
@@ -4,14 +4,14 @@
 import logging
 from collections import deque
 from time import time
-from typing import Callable, Dict, Optional, Set, Union
+from typing import Callable, Dict, Optional, Set
 
 from PyQt5.QtCore import QBuffer, QIODevice, QUrl
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest
 
 from tribler.gui.defs import BUTTON_TYPE_NORMAL, DEFAULT_API_HOST, DEFAULT_API_PORT, DEFAULT_API_PROTOCOL
 from tribler.gui.dialogs.confirmationdialog import ConfirmationDialog
-from tribler.gui.network.request import Request
+from tribler.gui.network.request import DATA_TYPE, Request
 from tribler.gui.utilities import connect
 
 
@@ -42,7 +42,7 @@ def get(self,
             endpoint: str,
             on_finish: Callable = lambda _: None,
             url_params: Optional[Dict] = None,
-            data: Optional[Union[bytes, str, Dict]] = None,
+            data: DATA_TYPE = None,
             capture_errors: bool = True,
             priority: int = QNetworkRequest.NormalPriority,
             raw_response: bool = False) -> Request:
@@ -57,7 +57,7 @@ def post(self,
              endpoint: str,
              on_finish: Callable = lambda _: None,
              url_params: Optional[Dict] = None,
-             data: Optional[Union[bytes, str, Dict]] = None,
+             data: DATA_TYPE = None,
              capture_errors: bool = True,
              priority: int = QNetworkRequest.NormalPriority,
              raw_response: bool = False) -> Request:
@@ -72,7 +72,7 @@ def put(self,
             endpoint: str,
             on_finish: Callable = lambda _: None,
             url_params: Optional[Dict] = None,
-            data: Optional[Union[bytes, str, Dict]] = None,
+            data: DATA_TYPE = None,
             capture_errors: bool = True,
             priority: int = QNetworkRequest.NormalPriority,
             raw_response: bool = False) -> Request:
@@ -87,7 +87,7 @@ def patch(self,
               endpoint: str,
               on_finish: Callable = lambda _: None,
               url_params: Optional[Dict] = None,
-              data: Optional[Union[bytes, str, Dict]] = None,
+              data: DATA_TYPE = None,
               capture_errors: bool = True,
               priority: int = QNetworkRequest.NormalPriority,
               raw_response: bool = False) -> Request:
@@ -102,7 +102,7 @@ def delete(self,
                endpoint: str,
                on_finish: Callable = lambda _: None,
                url_params: Optional[Dict] = None,
-               data: Optional[Union[bytes, str, Dict]] = None,
+               data: DATA_TYPE = None,
                capture_errors: bool = True,
                priority: int = QNetworkRequest.NormalPriority,
                raw_response: bool = False) -> Request:

diff --git a/src/tribler/gui/tribler_window.py b/src/tribler/gui/tribler_window.py
@@ -1,4 +1,3 @@
-import json
 import logging
 import os
 import signal
@@ -44,8 +43,8 @@
 from psutil import LINUX
 
 from tribler.core.upgrade.version_manager import VersionHistory
-from tribler.core.utilities.process_manager import ProcessManager
 from tribler.core.utilities.network_utils import default_network_utils
+from tribler.core.utilities.process_manager import ProcessManager
 from tribler.core.utilities.rest_utils import (
     FILE_SCHEME,
     MAGNET_SCHEME,
@@ -1222,7 +1221,11 @@ def node_info_updated(self, node_info):
         self.core_manager.events_manager.node_info_updated.emit(node_info)
 
     def on_channel_subscribe(self, channel_info):
-        patch_data = [{"public_key": channel_info['public_key'], "id": channel_info['id'], "subscribed": True}]
+        patch_data = [{
+            "public_key": channel_info['public_key'],
+            "id": channel_info['id'],
+            "subscribed": True
+        }]
         request_manager.patch("metadata", lambda data: self.node_info_updated(data[0]), data=patch_data)
 
     def on_channel_unsubscribe(self, channel_info):