Drop 'isSIPv2' function which was for QGIS v1 compatibility

connectors/postgis.py

@@ -128,12 +128,12 @@ def connect(self, selected, parent=None):
         if not settings.contains("database"):  # non-existent entry?
             raise DbError('there is no defined database connection "%s".' % selected)
 
-        get_value_str = lambda x: str(settings.value(x) if Utils.isSIPv2() else settings.value(x).toString())
+        get_value_str = lambda x: str(settings.value(x))
         service, host, port, database, username, password = list(map(get_value_str, ["service", "host", "port", "database", "username", "password"]))
 
         # qgis1.5 use 'savePassword' instead of 'save' setting
-        isSave = settings.value("save") if Utils.isSIPv2() else settings.value("save").toBool()
-        isSavePassword = settings.value("savePassword") if Utils.isSIPv2() else settings.value("savePassword").toBool()
+        isSave = settings.value("save")
+        isSavePassword = settings.value("savePassword")
         if not (isSave or isSavePassword):
             (password, ok) = QInputDialog.getText(parent, "Enter password", 'Enter password for connection "%s":' % selected, QLineEdit.Password)
             if not ok: return

pgRoutingLayer_utils.py

@@ -72,25 +72,14 @@ def setTransformQuotes(args, srid, canvas_srid):
         args['transform_e'] = sql.SQL("")
 
 
-def isSIPv2():
-    '''Checks the version of SIP '''
-    return sip.getapi('QVariant') > 1
-
-
 def getStringValue(settings, key, value):
     ''' returns key and its corresponding value. example: ("interval",30). '''
-    if isSIPv2():
-        return settings.value(key, value, type=str)
-    else:
-        return settings.value(key, QVariant(value)).toString()
+    return settings.value(key, value, type=str)
 
 
 def getBoolValue(settings, key, value):
     ''' returns True if settings exist otherwise False. '''
-    if isSIPv2():
-        return settings.value(key, value, type=bool)
-    else:
-        return settings.value(key, QVariant(value)).toBool()
+    return settings.value(key, value, type=bool)
 
 
 def getDestinationCrs(mapCanvas):

tests/Test_utils.py

@@ -62,9 +62,6 @@ def test_setEndPoint_2(self):
         utils.setEndPoint(geomType,args)
         self.assertEqual(args['endpoint'], 'ST_EndPoint(ST_GeometryN(test_geom, 1))')
 
-    def test_isSIPv2(self):
-        self.assertTrue(utils.isSIPv2())
-
     def test_getStringValue(self):
         setting = QSettings()
         setting.setValue('/pgRoutingLayer/Database', 99)