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

[bugfix] Use QgsApplication.authManager()

Browse Source 
instead of the old singleton
This commit is contained in:
Alessandro Pasotti 2017-11-07 08:56:20 +01:00
parent 7c9cd491bd
commit bb36fa7f48
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/pyplugin_installer/installer_data.py
View File

@ -41,7 +41,7 @@ try:
except ImportError: except ImportError:
from imp import reload from imp import reload
import qgis.utils import qgis.utils
from qgis.core import Qgis, QgsNetworkAccessManager, QgsAuthManager from qgis.core import Qgis, QgsNetworkAccessManager, QgsApplication
from qgis.gui import QgsMessageBar from qgis.gui import QgsMessageBar
from qgis.utils import iface, plugin_paths from qgis.utils import iface, plugin_paths
from .version_compare import compareVersions, normalizeVersion, isCompatible from .version_compare import compareVersions, normalizeVersion, isCompatible
@ -333,7 +333,7 @@ class Repositories(QObject):
self.mRepositories[key]["QRequest"] = QNetworkRequest(url) self.mRepositories[key]["QRequest"] = QNetworkRequest(url)
authcfg = self.mRepositories[key]["authcfg"] authcfg = self.mRepositories[key]["authcfg"]
if authcfg and isinstance(authcfg, str): if authcfg and isinstance(authcfg, str):
if not QgsAuthManager.instance().updateNetworkRequest( if not QgsApplication.authManager().updateNetworkRequest(
self.mRepositories[key]["QRequest"], authcfg.strip()): self.mRepositories[key]["QRequest"], authcfg.strip()):
msg = QCoreApplication.translate( msg = QCoreApplication.translate(
"QgsPluginInstaller", "QgsPluginInstaller",

4
python/pyplugin_installer/qgsplugininstallerinstallingdialog.py
View File

@ -30,7 +30,7 @@ from qgis.PyQt.QtWidgets import QDialog
from qgis.PyQt.QtNetwork import QNetworkRequest, QNetworkReply from qgis.PyQt.QtNetwork import QNetworkRequest, QNetworkReply
import qgis import qgis
from qgis.core import QgsNetworkAccessManager, QgsAuthManager from qgis.core import QgsNetworkAccessManager, QgsApplication
from .ui_qgsplugininstallerinstallingbase import Ui_QgsPluginInstallerInstallingDialogBase from .ui_qgsplugininstallerinstallingbase import Ui_QgsPluginInstallerInstallingDialogBase
from .installer_data import removeDir, repositories from .installer_data import removeDir, repositories
@ -60,7 +60,7 @@ class QgsPluginInstallerInstallingDialog(QDialog, Ui_QgsPluginInstallerInstallin
self.request = QNetworkRequest(url) self.request = QNetworkRequest(url)
authcfg = repositories.all()[plugin["zip_repository"]]["authcfg"] authcfg = repositories.all()[plugin["zip_repository"]]["authcfg"]
if authcfg and isinstance(authcfg, str): if authcfg and isinstance(authcfg, str):
if not QgsAuthManager.instance().updateNetworkRequest( if not QgsApplication.authManager().updateNetworkRequest(
self.request, authcfg.strip()): self.request, authcfg.strip()):
self.mResult = self.tr( self.mResult = self.tr(
"Update of network request with authentication " "Update of network request with authentication "