From: Erlend Egeberg Aasland <erlend.aasland@innova.no>
Date: Sat, 9 Jan 2021 11:25:55 +0000 (+0100)
Subject: bpo-24464: Fix sqlite3.enable_shared_cache() deprecation wrapper (GH-24170)
X-Git-Tag: v3.10.0a5~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d16f6176abdecbb7ab231dc78beccfaa095beff6;p=thirdparty%2FPython%2Fcpython.git

bpo-24464: Fix sqlite3.enable_shared_cache() deprecation wrapper (GH-24170)
---

diff --git a/Lib/sqlite3/dbapi2.py b/Lib/sqlite3/dbapi2.py
index 6475f98a646f..cfe6225f46ef 100644
--- a/Lib/sqlite3/dbapi2.py
+++ b/Lib/sqlite3/dbapi2.py
@@ -96,7 +96,7 @@ def enable_shared_cache(enable):
         "the cache=shared query parameter."
     )
     warnings.warn(msg, DeprecationWarning, stacklevel=2)
-    return _old_enable_shared_cache
+    return _old_enable_shared_cache(enable)
 
 # Clean up namespace
 
diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 68a306223953..39c9bf5b6114 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -23,6 +23,7 @@
 import threading
 import unittest
 import sqlite3 as sqlite
+import sys
 
 from test.support.os_helper import TESTFN, unlink
 
@@ -82,6 +83,9 @@ class ModuleTests(unittest.TestCase):
                                    sqlite.DatabaseError),
                         "NotSupportedError is not a subclass of DatabaseError")
 
+    # sqlite3_enable_shared_cache() is deprecated on macOS and calling it may raise
+    # OperationalError on some buildbots.
+    @unittest.skipIf(sys.platform == "darwin", "shared cache is deprecated on macOS")
     def test_shared_cache_deprecated(self):
         for enable in (True, False):
             with self.assertWarns(DeprecationWarning) as cm: