Skip to content

Commit 46a4435

Browse files
committed
Use a function to access plugins_metadata_parser global object
1 parent 0b3043f commit 46a4435

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

python/pyplugin_installer/plugindependencies.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from configparser import NoOptionError, NoSectionError
1616
from .version_compare import compareVersions
1717
from . import installer as plugin_installer
18-
from qgis.utils import updateAvailablePlugins, plugins_metadata_parser
18+
from qgis.utils import updateAvailablePlugins, metadataParser
1919

2020

2121
def __plugin_name_map(plugin_data_values):
@@ -29,7 +29,7 @@ def __get_plugin_deps(plugin_id):
2929
result = {}
3030
updateAvailablePlugins()
3131
try:
32-
parser = plugins_metadata_parser[plugin_id]
32+
parser = metadataParser()[plugin_id]
3333
plugin_deps = parser.get('general', 'plugin_dependencies')
3434
except (NoOptionError, NoSectionError, KeyError):
3535
return result
@@ -68,7 +68,7 @@ def find_dependencies(plugin_id, plugin_data=None, plugin_deps=None, installed_p
6868

6969
if installed_plugins is None:
7070
updateAvailablePlugins()
71-
metadata_parser = plugins_metadata_parser
71+
metadata_parser = metadataParser()
7272
installed_plugins = {metadata_parser[k].get('general', 'name'): metadata_parser[k].get('general', 'version') for k, v in metadata_parser.items()}
7373

7474
if plugin_data is None:

python/utils.py

+5
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@ def findPlugins(path):
265265
yield (pluginName, cp)
266266

267267

268+
def metadataParser():
269+
"""Used by other modules to access the local parser object"""
270+
return plugins_metadata_parser
271+
272+
268273
def updateAvailablePlugins():
269274
""" Go through the plugin_paths list and find out what plugins are available. """
270275
# merge the lists

0 commit comments

Comments
 (0)