From 11b3b081988691b749e194648a2b3d2af867f280 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Thu, 4 Nov 2021 08:19:05 +0100
Subject: [PATCH] Implemented code review suggestions

Contributes to CURA-8558
---
 plugins/Marketplace/LocalPackageList.py  | 6 +++++-
 plugins/Marketplace/PackageList.py       | 8 ++++----
 plugins/Marketplace/RemotePackageList.py | 3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/Marketplace/LocalPackageList.py b/plugins/Marketplace/LocalPackageList.py
index fd0e340c86..6acbaa8500 100644
--- a/plugins/Marketplace/LocalPackageList.py
+++ b/plugins/Marketplace/LocalPackageList.py
@@ -4,6 +4,9 @@
 from typing import Any, Dict, Generator, List, Optional, TYPE_CHECKING
 from PyQt5.QtCore import pyqtSlot, QObject
 
+if TYPE_CHECKING:
+    from PyQt5.QtCore import QObject
+
 from UM.i18n import i18nCatalog
 
 from cura.CuraApplication import CuraApplication
@@ -28,7 +31,7 @@ class LocalPackageList(PackageList):
             }
     }  # The section headers to be used for the different package categories
 
-    def __init__(self, parent: Optional[QObject] = None) -> None:
+    def __init__(self, parent: Optional["QObject"] = None) -> None:
         super().__init__(parent)
         self._manager = CuraApplication.getInstance().getPackageManager()
         self._has_footer = False
@@ -43,6 +46,7 @@ class LocalPackageList(PackageList):
         self.setIsLoading(True)
         self._getLocalPackages()
         self.setIsLoading(False)
+        self.setHasMore(False)  # All packages should have been loaded at this time
 
     def _getLocalPackages(self) -> None:
         """ Obtain the local packages.
diff --git a/plugins/Marketplace/PackageList.py b/plugins/Marketplace/PackageList.py
index e3b490a834..8171d168f2 100644
--- a/plugins/Marketplace/PackageList.py
+++ b/plugins/Marketplace/PackageList.py
@@ -2,7 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, Qt
-from typing import TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING
 
 from UM.i18n import i18nCatalog
 from UM.Qt.ListModel import ListModel
@@ -19,7 +19,7 @@ class PackageList(ListModel):
     """
     PackageRole = Qt.UserRole + 1
 
-    def __init__(self, parent: "QObject" = None) -> None:
+    def __init__(self, parent: Optional["QObject"] = None) -> None:
         super().__init__(parent)
         self._error_message = ""
         self.addRoleName(self.PackageRole, "package")
@@ -56,7 +56,7 @@ class PackageList(ListModel):
         """
         return self._is_loading
 
-    hasMoreChanged = pyqtSignal()  # The signal for hasMore property
+    hasMoreChanged = pyqtSignal()
 
     def setHasMore(self, value: bool) -> None:
         if self._has_more != value:
@@ -70,7 +70,7 @@ class PackageList(ListModel):
         """
         return self._has_more
 
-    errorMessageChanged = pyqtSignal()  # The signal for errorMessage property
+    errorMessageChanged = pyqtSignal()
 
     def setErrorMessage(self, error_message: str) -> None:
         if self._error_message != error_message:
diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py
index 3cfb11d6ba..7e8ee321ac 100644
--- a/plugins/Marketplace/RemotePackageList.py
+++ b/plugins/Marketplace/RemotePackageList.py
@@ -18,7 +18,6 @@ from .PackageModel import PackageModel  # The contents of this list.
 
 if TYPE_CHECKING:
     from PyQt5.QtCore import QObject
-    from PyQt5.QtNetwork import QNetworkReply
 
 catalog = i18nCatalog("cura")
 
@@ -26,7 +25,7 @@ catalog = i18nCatalog("cura")
 class RemotePackageList(PackageList):
     ITEMS_PER_PAGE = 20  # Pagination of number of elements to download at once.
 
-    def __init__(self, parent: "QObject" = None) -> None:
+    def __init__(self, parent: Optional["QObject"] = None) -> None:
         super().__init__(parent)
 
         self._ongoing_request: Optional[HttpRequestData] = None