Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-41861: Clean up sqlite3 header files wrt. PEP 384 #22419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

bpo-41861: Clean up sqlite3 header files wrt. PEP 384 #22419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b02d4e
Don't include pythread.h
Sep 26, 2020
d093796
Don't include structmember.h twice
Sep 26, 2020
626af39
Remove superfluous Python.h include
Sep 26, 2020
6be86c9
Include structmember.h in the .c file, where it's used
Oct 5, 2020
f184612
Explicitly include structmember.h in cursor.c
Oct 5, 2020
926e238
Include structmember.h after Python.h
Oct 5, 2020
b98761c
Fix PyMemberDef in statement.c
Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@

#include "cache.h"
#include "module.h"
#include "structmember.h" // PyMemberDef
#include "connection.h"
#include "statement.h"
#include "cursor.h"
#include "prepare_protocol.h"
#include "util.h"

#include "structmember.h" // PyMemberDef

#define ACTION_FINALIZE 1
#define ACTION_RESET 2

Expand Down
2 changes: 0 additions & 2 deletions Modules/_sqlite/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
#define PYSQLITE_CONNECTION_H
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "pythread.h"
#include "structmember.h"

#include "cache.h"
#include "module.h"
Expand Down
2 changes: 2 additions & 0 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "module.h"
#include "util.h"

#include "structmember.h" // PyMemberDef

PyObject* pysqlite_cursor_iternext(pysqlite_Cursor* self);

static const char errmsg_fetch_across_rollback[] = "Cursor needed to be reset because of commit/rollback and can no longer be fetched from.";
Expand Down
2 changes: 0 additions & 2 deletions Modules/_sqlite/microprotocols.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
* 3. This notice may not be removed or altered from any source distribution.
*/

#include <Python.h>

#include "cursor.h"
#include "microprotocols.h"
#include "prepare_protocol.h"
Expand Down
4 changes: 3 additions & 1 deletion Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "prepare_protocol.h"
#include "util.h"

#include "structmember.h" // PyMemberDef

/* prototypes */
static int pysqlite_check_remaining_sql(const char* tail);

Expand Down Expand Up @@ -461,7 +463,7 @@ static int pysqlite_check_remaining_sql(const char* tail)
return 0;
}

static PyMemberDef stmt_members[] = {
static struct PyMemberDef stmt_members[] = {
{"__weaklistoffset__", T_PYSSIZET, offsetof(pysqlite_Statement, in_weakreflist), READONLY},
{NULL},
};
Expand Down
2 changes: 1 addition & 1 deletion Modules/_sqlite/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#define PYSQLITE_UTIL_H
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "pythread.h"

#include "sqlite3.h"
#include "connection.h"

Expand Down