sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a function to access plugins_metadata_parser global object

Browse Source
This commit is contained in:
Alessandro Pasotti 2019-05-10 10:21:05 +02:00
parent 0b3043fc75
commit 46a4435e65
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/pyplugin_installer/plugindependencies.py
View File

@ -15,7 +15,7 @@ __copyright__ = 'Copyright 2018, GISCE-TI S.L.'
from configparser import NoOptionError, NoSectionError
from .version_compare import compareVersions
from . import installer as plugin_installer
from qgis.utils import updateAvailablePlugins, plugins_metadata_parser
from qgis.utils import updateAvailablePlugins, metadataParser
def __plugin_name_map(plugin_data_values):
@ -29,7 +29,7 @@ def __get_plugin_deps(plugin_id):
result = {}
updateAvailablePlugins()
try:
parser = plugins_metadata_parser[plugin_id]
parser = metadataParser()[plugin_id]
plugin_deps = parser.get('general', 'plugin_dependencies')
except (NoOptionError, NoSectionError, KeyError):
return result
@ -68,7 +68,7 @@ def find_dependencies(plugin_id, plugin_data=None, plugin_deps=None, installed_p
if installed_plugins is None:
updateAvailablePlugins()
metadata_parser = plugins_metadata_parser
metadata_parser = metadataParser()
installed_plugins = {metadata_parser[k].get('general', 'name'): metadata_parser[k].get('general', 'version') for k, v in metadata_parser.items()}
if plugin_data is None:

5
python/utils.py
View File

@ -265,6 +265,11 @@ def findPlugins(path):
yield (pluginName, cp)
def metadataParser():
"""Used by other modules to access the local parser object"""
return plugins_metadata_parser
def updateAvailablePlugins():
""" Go through the plugin_paths list and find out what plugins are available. """
# merge the lists