Rename macro to PY_SQLITE_ENABLE_LOAD_EXTENSION

Author: tiran

Misc/NEWS.d/next/Build/2021-11-05-20-56-29.bpo-45731.9SDnDf.rst

@@ -1 +1 @@
-``configure --enable-loadable-sqlite-extensions`` is now handled by new ``PY_SQLITE_ENABLE_LOADABLE_EXTENSION`` instead of logic in setup.py.
+``configure --enable-loadable-sqlite-extensions`` is now handled by new ``PY_SQLITE_ENABLE_LOAD_EXTENSION`` macro instead of logic in setup.py.

Modules/_sqlite/clinic/connection.c.h

@@ -367,7 +367,7 @@ pysqlite_connection_set_trace_callback(pysqlite_Connection *self, PyTypeObject *
     return return_value;
 }
 
-#if defined(PY_SQLITE_ENABLE_LOADABLE_EXTENSION)
+#if defined(PY_SQLITE_ENABLE_LOAD_EXTENSION)
 
 PyDoc_STRVAR(pysqlite_connection_enable_load_extension__doc__,
 "enable_load_extension($self, enable, /)\n"
@@ -398,9 +398,9 @@ pysqlite_connection_enable_load_extension(pysqlite_Connection *self, PyObject *a
     return return_value;
 }
 
-#endif /* defined(PY_SQLITE_ENABLE_LOADABLE_EXTENSION) */
+#endif /* defined(PY_SQLITE_ENABLE_LOAD_EXTENSION) */
 
-#if defined(PY_SQLITE_ENABLE_LOADABLE_EXTENSION)
+#if defined(PY_SQLITE_ENABLE_LOAD_EXTENSION)
 
 PyDoc_STRVAR(pysqlite_connection_load_extension__doc__,
 "load_extension($self, name, /)\n"
@@ -440,7 +440,7 @@ pysqlite_connection_load_extension(pysqlite_Connection *self, PyObject *arg)
     return return_value;
 }
 
-#endif /* defined(PY_SQLITE_ENABLE_LOADABLE_EXTENSION) */
+#endif /* defined(PY_SQLITE_ENABLE_LOAD_EXTENSION) */
 
 PyDoc_STRVAR(pysqlite_connection_execute__doc__,
 "execute($self, sql, parameters=<unrepresentable>, /)\n"
@@ -834,4 +834,4 @@ getlimit(pysqlite_Connection *self, PyObject *arg)
 #ifndef PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
     #define PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
 #endif /* !defined(PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF) */
-/*[clinic end generated code: output=38de40d9c6fa2220 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d71bf16bef67878f input=a9049054013a1b77]*/

Modules/_sqlite/connection.c

@@ -1225,7 +1225,7 @@ pysqlite_connection_set_trace_callback_impl(pysqlite_Connection *self,
     Py_RETURN_NONE;
 }
 
-#ifdef PY_SQLITE_ENABLE_LOADABLE_EXTENSION
+#ifdef PY_SQLITE_ENABLE_LOAD_EXTENSION
 /*[clinic input]
 _sqlite3.Connection.enable_load_extension as pysqlite_connection_enable_load_extension
 

configure

@@ -10922,7 +10922,7 @@ $as_echo "$enable_loadable_sqlite_extensions" >&6; }
 if test "x$enable_loadable_sqlite_extensions" = xyes; then :
 
 
-$as_echo "#define PY_SQLITE_ENABLE_LOADABLE_EXTENSION 1" >>confdefs.h
+$as_echo "#define PY_SQLITE_ENABLE_LOAD_EXTENSION 1" >>confdefs.h
 
 
 fi

configure.ac

@@ -3203,8 +3203,8 @@ AC_ARG_ENABLE(loadable-sqlite-extensions,
 AC_MSG_RESULT($enable_loadable_sqlite_extensions)
 
 AS_VAR_IF([enable_loadable_sqlite_extensions], [yes], [
-  AC_DEFINE(PY_SQLITE_ENABLE_LOADABLE_EXTENSION, 1,
-  [Define to 1 to build sqlite module with loadable extensions.])
+  AC_DEFINE(PY_SQLITE_ENABLE_LOAD_EXTENSION, 1,
+  [Define to 1 to build the sqlite module with loadable extensions support.])
 ])
 
 # Check for --with-tcltk-includes=path and --with-tcltk-libs=path

pyconfig.h.in

@@ -1395,8 +1395,8 @@
 /* Define to printf format modifier for Py_ssize_t */
 #undef PY_FORMAT_SIZE_T
 
-/* Define to 1 to build sqlite module with loadable extensions. */
-#undef PY_SQLITE_ENABLE_LOADABLE_EXTENSION
+/* Define to 1 to build the sqlite module with loadable extensions support. */
+#undef PY_SQLITE_ENABLE_LOAD_EXTENSION
 
 /* Default cipher suites list for ssl module. 1: Python's preferred selection,
    2: leave OpenSSL defaults untouched, 0: custom string */

setup.py

@@ -1605,7 +1605,7 @@ def detect_sqlite(self):
             if (
                 MACOS and
                 sqlite_incdir == os.path.join(MACOS_SDK_ROOT, "usr/include") and
-                sysconfig.get_config_var("PY_SQLITE_ENABLE_LOADABLE_EXTENSION")
+                sysconfig.get_config_var("PY_SQLITE_ENABLE_LOAD_EXTENSION")
             ):
                 raise DistutilsError("System version of SQLite does not support loadable extensions")