diff --git a/CHANGELOG b/CHANGELOG index e5e05863ca..95ad8c1d5d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Remove support for pysqlite2 * Do not import empty One2Many data * Deduplicate entries in domain inversion's simplify * Prevent to create and delete singleton diff --git a/trytond/backend/sqlite/database.py b/trytond/backend/sqlite/database.py index 1703181a5a..80dcbda80e 100644 --- a/trytond/backend/sqlite/database.py +++ b/trytond/backend/sqlite/database.py @@ -5,29 +5,22 @@ import logging import math import os import random +import sqlite3 as sqlite import threading import time import urllib.parse import warnings from decimal import Decimal +from sqlite3 import IntegrityError as DatabaseIntegrityError +from sqlite3 import OperationalError as DatabaseOperationalError from weakref import WeakKeyDictionary -from werkzeug.security import safe_join - -try: - from pysqlite2 import dbapi2 as sqlite - from pysqlite2.dbapi2 import IntegrityError as DatabaseIntegrityError - from pysqlite2.dbapi2 import OperationalError as DatabaseOperationalError -except ImportError: - import sqlite3 as sqlite - from sqlite3 import IntegrityError as DatabaseIntegrityError - from sqlite3 import OperationalError as DatabaseOperationalError - from sql import Expression, Flavor, Literal, Null, Query, Table from sql.conditionals import NullIf from sql.functions import ( CharLength, CurrentTimestamp, Extract, Function, Overlay, Position, Substring, Trim) +from werkzeug.security import safe_join from trytond.backend.database import DatabaseInterface, SQLType from trytond.config import config, parse_uri diff --git a/trytond/tests/test_tryton.py b/trytond/tests/test_tryton.py index 7f27ebd751..49de15f0a0 100644 --- a/trytond/tests/test_tryton.py +++ b/trytond/tests/test_tryton.py @@ -123,9 +123,6 @@ def _sqlite_copy(file_, restore=False): with Transaction().start(DB_NAME, 0) as transaction, \ sqlite.connect(file_) as conn2: conn1 = transaction.connection - # sqlitebck does not work with pysqlite2 - if not isinstance(conn1, sqlite.Connection): - return False if restore: conn2, conn1 = conn1, conn2 if hasattr(conn1, 'backup'):