Use sqlite3 instead of pyspatialite for SpatiaLite connections

gacarrillor · gacarrillor · commit 6402160526e3 · 2017-10-29T10:46:54.000-05:00
diff --git a/python/utils.py b/python/utils.py
@@ -590,38 +590,33 @@ def startServerPlugin(packageName):
 
 def spatialite_connect(*args, **kwargs):
     """returns a dbapi2.Connection to a SpatiaLite db
-either using pyspatialite if it is present
-or using the "mod_spatialite" extension (python3)"""
-    try:
-        from pyspatialite import dbapi2
-    except ImportError:
-        import sqlite3
-        con = sqlite3.dbapi2.connect(*args, **kwargs)
-        con.enable_load_extension(True)
-        cur = con.cursor()
-        libs = [
-            # SpatiaLite >= 4.2 and Sqlite >= 3.7.17, should work on all platforms
-            ("mod_spatialite", "sqlite3_modspatialite_init"),
-            # SpatiaLite >= 4.2 and Sqlite < 3.7.17 (Travis)
-            ("mod_spatialite.so", "sqlite3_modspatialite_init"),
-            # SpatiaLite < 4.2 (linux)
-            ("libspatialite.so", "sqlite3_extension_init")
-        ]
-        found = False
-        for lib, entry_point in libs:
-            try:
-                cur.execute("select load_extension('{}', '{}')".format(lib, entry_point))
-            except sqlite3.OperationalError:
-                continue
-            else:
-                found = True
-                break
-        if not found:
-            raise RuntimeError("Cannot find any suitable spatialite module")
-        cur.close()
-        con.enable_load_extension(False)
-        return con
-    return dbapi2.connect(*args, **kwargs)
+using the "mod_spatialite" extension (python3)"""
+    import sqlite3
+    con = sqlite3.dbapi2.connect(*args, **kwargs)
+    con.enable_load_extension(True)
+    cur = con.cursor()
+    libs = [
+        # SpatiaLite >= 4.2 and Sqlite >= 3.7.17, should work on all platforms
+        ("mod_spatialite", "sqlite3_modspatialite_init"),
+        # SpatiaLite >= 4.2 and Sqlite < 3.7.17 (Travis)
+        ("mod_spatialite.so", "sqlite3_modspatialite_init"),
+        # SpatiaLite < 4.2 (linux)
+        ("libspatialite.so", "sqlite3_extension_init")
+    ]
+    found = False
+    for lib, entry_point in libs:
+        try:
+            cur.execute("select load_extension('{}', '{}')".format(lib, entry_point))
+        except sqlite3.OperationalError:
+            continue
+        else:
+            found = True
+            break
+    if not found:
+        raise RuntimeError("Cannot find any suitable spatialite module")
+    cur.close()
+    con.enable_load_extension(False)
+    return con
 
 
 class OverrideCursor():
