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

Tidy installer_data.py and utils.py

Browse Source 
- Fix unused and missing imports
- Only import configparser is needed for Python 3
- Unnecessary string u prefix for Python 3
- Comment typo
This commit is contained in:
Chris Mayo 2018-08-31 19:23:14 +01:00 committed by Nyall Dawson
parent b2275df176
commit 70a37bf981
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python/pyplugin_installer/installer_data.py
View File

@ -28,22 +28,14 @@ from qgis.PyQt.QtCore import (pyqtSignal, QObject, QCoreApplication, QFile,
QLocale, QByteArray) QLocale, QByteArray)
from qgis.PyQt.QtXml import QDomDocument from qgis.PyQt.QtXml import QDomDocument
from qgis.PyQt.QtNetwork import QNetworkRequest, QNetworkReply from qgis.PyQt.QtNetwork import QNetworkRequest, QNetworkReply
from qgis.core import QgsSettings from qgis.core import Qgis, QgsSettings
import sys import sys
import os import os
import codecs import codecs
import re import re
try: import configparser
import configparser
except ImportError:
import configparser as configparser
try:
from importlib import reload
except ImportError:
from imp import reload
import qgis.utils import qgis.utils
from qgis.core import QgsNetworkAccessManager, QgsApplication from qgis.core import QgsNetworkAccessManager, QgsApplication
from qgis.gui import QgsMessageBar
from qgis.utils import iface, plugin_paths from qgis.utils import iface, plugin_paths
from .version_compare import pyQgisVersion, compareVersions, normalizeVersion, isCompatible from .version_compare import pyQgisVersion, compareVersions, normalizeVersion, isCompatible
@ -565,7 +557,7 @@ class Plugins(QObject):
""" get the metadata of an installed plugin """ """ get the metadata of an installed plugin """
def metadataParser(fct): def metadataParser(fct):
""" plugin metadata parser reimplemented from qgis.utils """ plugin metadata parser reimplemented from qgis.utils
for better control on wchich module is examined for better control of which module is examined
in case there is an installed plugin masking a core one """ in case there is an installed plugin masking a core one """
global errorDetails global errorDetails
cp = configparser.ConfigParser() cp = configparser.ConfigParser()
@ -625,7 +617,7 @@ class Plugins(QObject):
else: else:
error = "broken" error = "broken"
e = errorDetails e = errorDetails
errorDetails = QCoreApplication.translate("QgsPluginInstaller", u"Error reading metadata") errorDetails = QCoreApplication.translate("QgsPluginInstaller", "Error reading metadata")
if e: if e:
errorDetails += ": " + e errorDetails += ": " + e

7
python/utils.py
View File

@ -30,7 +30,7 @@ QGIS utilities module
from qgis.PyQt.QtCore import QCoreApplication, QLocale, QThread from qgis.PyQt.QtCore import QCoreApplication, QLocale, QThread
from qgis.PyQt.QtWidgets import QPushButton, QApplication from qgis.PyQt.QtWidgets import QPushButton, QApplication
from qgis.core import Qgis, QgsExpression, QgsMessageLog, qgsfunction, QgsMessageOutput, QgsWkbTypes from qgis.core import Qgis, QgsMessageLog, qgsfunction, QgsMessageOutput
from qgis.gui import QgsMessageBar from qgis.gui import QgsMessageBar
import os import os
@ -38,10 +38,7 @@ import sys
import traceback import traceback
import glob import glob
import os.path import os.path
try: import configparser
import configparser
except ImportError:
import ConfigParser as configparser
import warnings import warnings
import codecs import codecs
import time import time