Skip to content

Commit 822d50f

Browse files
author
Erlend E. Aasland
committed
Sync clinic with master
1 parent dab5c43 commit 822d50f

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

Modules/_sqlite/clinic/connection.c.h

+5-13
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ PyDoc_STRVAR(pysqlite_connection_set_trace_callback__doc__,
369369
#define PYSQLITE_CONNECTION_SET_TRACE_CALLBACK_METHODDEF \
370370
{"set_trace_callback", (PyCFunction)pysqlite_connection_set_trace_callback, METH_O, pysqlite_connection_set_trace_callback__doc__},
371371

372-
#if defined(HAVE_LOAD_EXTENSION)
372+
#if !defined(SQLITE_OMIT_LOAD_EXTENSION)
373373

374374
PyDoc_STRVAR(pysqlite_connection_enable_load_extension__doc__,
375375
"enable_load_extension($self, enable, /)\n"
@@ -400,9 +400,9 @@ pysqlite_connection_enable_load_extension(pysqlite_Connection *self, PyObject *a
400400
return return_value;
401401
}
402402

403-
#endif /* defined(HAVE_LOAD_EXTENSION) */
403+
#endif /* !defined(SQLITE_OMIT_LOAD_EXTENSION) */
404404

405-
#if defined(HAVE_LOAD_EXTENSION)
405+
#if !defined(SQLITE_OMIT_LOAD_EXTENSION)
406406

407407
PyDoc_STRVAR(pysqlite_connection_load_extension__doc__,
408408
"load_extension($self, name, /)\n"
@@ -442,7 +442,7 @@ pysqlite_connection_load_extension(pysqlite_Connection *self, PyObject *arg)
442442
return return_value;
443443
}
444444

445-
#endif /* defined(HAVE_LOAD_EXTENSION) */
445+
#endif /* !defined(SQLITE_OMIT_LOAD_EXTENSION) */
446446

447447
PyDoc_STRVAR(pysqlite_connection_execute__doc__,
448448
"execute($self, sql, /, parameters=<unrepresentable>)\n"
@@ -575,8 +575,6 @@ pysqlite_connection_iterdump(pysqlite_Connection *self, PyObject *Py_UNUSED(igno
575575
return pysqlite_connection_iterdump_impl(self);
576576
}
577577

578-
#if defined(HAVE_BACKUP_API)
579-
580578
PyDoc_STRVAR(pysqlite_connection_backup__doc__,
581579
"backup($self, /, target=<unrepresentable>, *, pages=-1, progress=None,\n"
582580
" name=\'main\', sleep=0.25)\n"
@@ -677,8 +675,6 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *const *args, Py_
677675
return return_value;
678676
}
679677

680-
#endif /* defined(HAVE_BACKUP_API) */
681-
682678
PyDoc_STRVAR(pysqlite_connection_create_collation__doc__,
683679
"create_collation($self, name, callback, /)\n"
684680
"--\n"
@@ -779,8 +775,4 @@ pysqlite_connection_exit(pysqlite_Connection *self, PyObject *const *args, Py_ss
779775
#ifndef PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
780776
#define PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
781777
#endif /* !defined(PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF) */
782-
783-
#ifndef PYSQLITE_CONNECTION_BACKUP_METHODDEF
784-
#define PYSQLITE_CONNECTION_BACKUP_METHODDEF
785-
#endif /* !defined(PYSQLITE_CONNECTION_BACKUP_METHODDEF) */
786-
/*[clinic end generated code: output=d1fb1f48710a3cd4 input=a9049054013a1b77]*/
778+
/*[clinic end generated code: output=578e5f247210bbdf input=a9049054013a1b77]*/

Modules/_sqlite/clinic/module.c.h

+1-9
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ pysqlite_complete_statement(PyObject *module, PyObject *arg)
151151
return return_value;
152152
}
153153

154-
#if defined(HAVE_SHARED_CACHE)
155-
156154
PyDoc_STRVAR(pysqlite_enable_shared_cache__doc__,
157155
"enable_shared_cache($module, enable, /)\n"
158156
"--\n"
@@ -183,8 +181,6 @@ pysqlite_enable_shared_cache(PyObject *module, PyObject *arg)
183181
return return_value;
184182
}
185183

186-
#endif /* defined(HAVE_SHARED_CACHE) */
187-
188184
PyDoc_STRVAR(pysqlite_register_adapter__doc__,
189185
"register_adapter($module, type, caster, /)\n"
190186
"--\n"
@@ -321,8 +317,4 @@ pysqlite_adapt(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
321317
exit:
322318
return return_value;
323319
}
324-
325-
#ifndef PYSQLITE_ENABLE_SHARED_CACHE_METHODDEF
326-
#define PYSQLITE_ENABLE_SHARED_CACHE_METHODDEF
327-
#endif /* !defined(PYSQLITE_ENABLE_SHARED_CACHE_METHODDEF) */
328-
/*[clinic end generated code: output=5e0bb0b26046264e input=a9049054013a1b77]*/
320+
/*[clinic end generated code: output=79068baf73b272f8 input=a9049054013a1b77]*/

0 commit comments

Comments
 (0)