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

Erlend Egeberg Aasland · web-flow · commit d16f6176abde · 2021-01-09T13:25:55.000+02:00
diff --git 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
@@ -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 @@ def test_not_supported_error(self):
                                    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:

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ def enable_shared_cache(enable):`
`96`	`96`	`"the cache=shared query parameter."`
`97`	`97`	`)`
`98`	`98`	`warnings.warn(msg, DeprecationWarning, stacklevel=2)`
`99`		`- return _old_enable_shared_cache`
	`99`	`+ return _old_enable_shared_cache(enable)`
`100`	`100`
`101`	`101`	`# Clean up namespace`
`102`	`102`