From 6dac500f187470ba8aa3e9f42faaa1b2fcb57a0a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 20 Dec 2021 10:30:53 +0100 Subject: Simplify getAllLocalPackages CURA-8587 --- cura/CuraPackageManager.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'cura/CuraPackageManager.py') diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 79763351b9..af75aa7b66 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -76,13 +76,10 @@ class CuraPackageManager(PackageManager): return machine_with_materials, machine_with_qualities def getAllLocalPackages(self) -> List[Dict[str, Any]]: - """ returns an unordered list of all the package_info installed, to be installed or to be returned""" + """ Returns an unordered list of all the package_info of installed, to be installed, or bundled packages""" + packages: List[Dict[str, Any]] = [] + for packages_to_add in self.getAllInstalledPackagesInfo().values(): + packages.extend(packages_to_add) - class PkgInfo(dict): - # Needed helper class because a dict isn't hashable - def __eq__(self, item): - return item == self["package_id"] - - packages = [PkgInfo(package_info) for package in self.getAllInstalledPackagesInfo().values() for package_info in package] - return [dict(package) for package in packages] + return packages -- cgit v1.2.3