From 4f6c271490522cf85484f3dc44fbc3fda7d1130e Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 1 Apr 2016 15:52:05 +0200 Subject: [PATCH] move new composer tests to pyqt wrappers (followup 7a8a541 and f413046) --- scripts/qgis_fixes/fix_print_with_import.py | 12 ++++++------ tests/src/python/test_qgscomposerpolygon.py | 6 +++--- tests/src/python/test_qgscomposerpolyline.py | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/qgis_fixes/fix_print_with_import.py b/scripts/qgis_fixes/fix_print_with_import.py index 66ce64d5414..b9b00984d4a 100644 --- a/scripts/qgis_fixes/fix_print_with_import.py +++ b/scripts/qgis_fixes/fix_print_with_import.py @@ -6,12 +6,12 @@ class FixPrintWithImport(FixPrintWithImportOrig): def match(self, node): isPrint = super(FixPrintWithImport, self).match(node) - if isPrint and - len(node.children) == 2 and \ - isinstance(node.children[0], Leaf) and \ - isinstance(node.children[1], Node) and node.children[1].type == syms.atom and \ - isinstance(node.children[1].children[0], Leaf) and node.children[1].children[0].value == '(' and \ - isinstance(node.children[1].children[-1], Leaf) and node.children[1].children[-1].value == ')': + if isPrint and \ + len(node.children) == 2 and \ + isinstance(node.children[0], Leaf) and \ + isinstance(node.children[1], Node) and node.children[1].type == syms.atom and \ + isinstance(node.children[1].children[0], Leaf) and node.children[1].children[0].value == '(' and \ + isinstance(node.children[1].children[-1], Leaf) and node.children[1].children[-1].value == ')': return False return ok diff --git a/tests/src/python/test_qgscomposerpolygon.py b/tests/src/python/test_qgscomposerpolygon.py index 926cb5f1b09..1a070ea38b7 100644 --- a/tests/src/python/test_qgscomposerpolygon.py +++ b/tests/src/python/test_qgscomposerpolygon.py @@ -14,9 +14,9 @@ __revision__ = '$Format:%H$' import qgis -from PyQt4.QtGui import QColor -from PyQt4.QtGui import QPolygonF -from PyQt4.QtCore import QPointF +from PyQt.QtGui import QColor +from PyQt.QtGui import QPolygonF +from PyQt.QtCore import QPointF from qgis.core import (QgsComposerPolygon, QgsComposerItem, diff --git a/tests/src/python/test_qgscomposerpolyline.py b/tests/src/python/test_qgscomposerpolyline.py index 0239684b949..27ff284666c 100644 --- a/tests/src/python/test_qgscomposerpolyline.py +++ b/tests/src/python/test_qgscomposerpolyline.py @@ -14,9 +14,9 @@ __revision__ = '$Format:%H$' import qgis -from PyQt4.QtGui import QColor -from PyQt4.QtGui import QPolygonF -from PyQt4.QtCore import QPointF +from PyQt.QtGui import QColor +from PyQt.QtGui import QPolygonF +from PyQt.QtCore import QPointF from qgis.core import (QgsComposerPolyline, QgsComposerItem,