Fixup for AppStartup test which requires SIP API V1

qgis · May 2, 2016 · dd136f6 · dd136f6
1 parent a230fc9
commit dd136f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/python/core/__init__.py b/python/core/__init__.py
@@ -174,7 +174,7 @@ def __hash__(self):
         # TODO: Fixme, this creates an invalid variant, not a NULL one
         from PyQt5.QtCore import QVariant
         NULL = QVariant()
-    except ImportError:
+    except (ImportError, RuntimeError):
         pass
 
 

diff --git a/tests/src/python/test_qgsappstartup.py b/tests/src/python/test_qgsappstartup.py
@@ -14,7 +14,6 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
-import qgis
 from PyQt4 import QtCore
 import sys
 import os

diff --git a/tests/src/python/utilities.py b/tests/src/python/utilities.py
@@ -18,8 +18,8 @@
 import platform
 import tempfile
 
-from qgis.PyQt.QtCore import QSize, QDir
-from qgis.PyQt.QtWidgets import QWidget
+from PyQt4.QtCore import QSize, QDir
+from PyQt4.QtGui import QWidget
 
 from qgis.core import (
     QgsApplication,