Skip to content

Commit ddc081a

Browse files
committed
lib.shpypi: Replaced pkg_resources.working_set with importlib.metadata.distributions()
1 parent d477cb0 commit ddc081a

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

lib/shpypi.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,20 @@ def get_installed_packages(self):
152152
"""
153153

154154
installed_packages_dict = {}
155-
#installed_packages = pkg_resources.working_set
156-
#for dist in installed_packages:
157-
# installed_packages_dict[dist.key] = dist.version
155+
installed_packages = pkg_resources.working_set
156+
for dist in installed_packages:
157+
installed_packages_dict[dist.key] = dist.version
158158

159159
### -------
160+
installed_packages_dict2 = {}
160161
distributions = importlib.metadata.distributions()
161162
for dist in distributions:
162-
installed_packages_dict[dist.metadata['Name']] = dist.version
163+
installed_packages_dict2[dist.metadata['Name']] = dist.version
163164
### -------
165+
self.logger.warning(f"{installed_packages_dict=}")
166+
self.logger.warning(f"{installed_packages_dict2=}")
167+
for pkgname in installed_packages_dict.keys():
168+
self.logger.warning(f"{pkgname}: '{installed_packages_dict[pkgname]}' - '{installed_packages_dict2.get(pkgname, '?')}'")
164169

165170
self.logger.info(f"get_installed_packages: installed_packages_dict = {installed_packages_dict}")
166171
return installed_packages_dict

0 commit comments

Comments
 (0)