Fix some Python warnings, avoid accidently hiding all deprecation war…

…nings (cherry picked from commit f5a3485)
qgis · Mar 28, 2019 · 7590009 · 7590009
1 parent fe1be46
commit 7590009
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/python/plugins/MetaSearch/dialogs/newconnectiondialog.py b/python/plugins/MetaSearch/dialogs/newconnectiondialog.py
@@ -27,7 +27,6 @@
 #
 ###############################################################################
 
-import warnings
 from qgis.core import QgsSettings
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 

diff --git a/python/plugins/MetaSearch/util.py b/python/plugins/MetaSearch/util.py
@@ -24,11 +24,6 @@
 #
 ###############################################################################
 
-# avoid PendingDeprecationWarning from PyQt4.uic
-import warnings
-warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-
 from gettext import gettext, ngettext
 import logging
 import os

diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -64,7 +64,11 @@
                        QgsVectorLayer,
                        QgsProviderRegistry)
 from qgis.utils import iface
-from osgeo import ogr
+
+import warnings
+with warnings.catch_warnings():
+    warnings.filterwarnings("ignore", category=DeprecationWarning)
+    from osgeo import ogr
 
 from processing.core.ProcessingConfig import ProcessingConfig
 

diff --git a/python/plugins/processing/algs/help/__init__.py b/python/plugins/processing/algs/help/__init__.py
@@ -43,7 +43,7 @@ def loadShortHelp():
             with codecs.open(filename, encoding='utf-8') as stream:
                 with warnings.catch_warnings():
                     warnings.filterwarnings("ignore", category=DeprecationWarning)
-                    for k, v in yaml.load(stream).items():
+                    for k, v in yaml.load(stream, Loader=yaml.SafeLoader).items():
                         if v is None:
                             continue
                         h[k] = QCoreApplication.translate("{}Algorithm".format(f[:-5].upper()), v)

diff --git a/python/plugins/processing/algs/qgis/Datasources2Vrt.py b/python/plugins/processing/algs/qgis/Datasources2Vrt.py
@@ -28,7 +28,10 @@
 import codecs
 import xml.sax.saxutils
 
-from osgeo import ogr
+import warnings
+with warnings.catch_warnings():
+    warnings.filterwarnings("ignore", category=DeprecationWarning)
+    from osgeo import ogr
 from qgis.core import (QgsProcessingFeedback,
                        QgsProcessingParameterMultipleLayers,
                        QgsProcessingParameterBoolean,

diff --git a/python/plugins/processing/gui/wrappers.py b/python/plugins/processing/gui/wrappers.py
@@ -1901,7 +1901,7 @@ def setValue(self, value):
 
                 for v in value:
                     for i, opt in enumerate(options):
-                        match = re.search('(?:\A|[^0-9]){}(?:\Z|[^0-9]|)'.format(v), opt)
+                        match = re.search('(?:\\A|[^0-9]){}(?:\\Z|[^0-9]|)'.format(v), opt)
                         if match:
                             selected.append(i)
 
@@ -1916,7 +1916,7 @@ def value(self):
             if self.parameterDefinition().allowMultiple():
                 bands = []
                 for i in self.widget.selectedoptions:
-                    match = re.search('(?:\A|[^0-9])([0-9]+)(?:\Z|[^0-9]|)', self.widget.options[i])
+                    match = re.search('(?:\\A|[^0-9])([0-9]+)(?:\\Z|[^0-9]|)', self.widget.options[i])
                     if match:
                         bands.append(match.group(1))
                 return bands

diff --git a/python/plugins/processing/tests/AlgorithmsTestBase.py b/python/plugins/processing/tests/AlgorithmsTestBase.py
@@ -72,7 +72,7 @@ def test_algorithms(self):
         This is the main test function. All others will be executed based on the definitions in testdata/algorithm_tests.yaml
         """
         with open(os.path.join(processingTestDataPath(), self.test_definition_file()), 'r') as stream:
-            algorithm_tests = yaml.load(stream)
+            algorithm_tests = yaml.load(stream, Loader=yaml.SafeLoader)
 
         if 'tests' in algorithm_tests and algorithm_tests['tests'] is not None:
             for idx, algtest in enumerate(algorithm_tests['tests']):