Skip to content

Use Unconstructible trait for internal types #6052

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

Merged
youknowone merged 2 commits into from
Aug 1, 2025
Merged

Use Unconstructible trait for internal types #6052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2d6594
Prevent direct instantiation of sqlite3.{Statement,Blob}
ever0de Aug 1, 2025
ec0a232
Use `Unconstructible` trait for internal types
ever0de Aug 1, 2025
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
2 changes: 0 additions & 2 deletions Lib/test/test_sqlite3/test_dbapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,6 @@ def test_extended_error_code_on_exception(self):
sqlite.SQLITE_CONSTRAINT_CHECK)
self.assertEqual(exc.sqlite_errorname, "SQLITE_CONSTRAINT_CHECK")

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_disallow_instantiation(self):
cx = sqlite.connect(":memory:")
check_disallow_instantiation(self, type(cx("select 1")))
Expand Down
14 changes: 9 additions & 5 deletions stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ mod _sqlite {
sliceable::{SaturatedSliceIter, SliceableSequenceOp},
types::{
AsMapping, AsSequence, Callable, Comparable, Constructor, Hashable, IterNext, Iterable,
PyComparisonOp, SelfIter,
PyComparisonOp, SelfIter, Unconstructible,
},
utils::ToCString,
};
Expand Down Expand Up @@ -2036,14 +2036,16 @@ mod _sqlite {
}

#[pyattr]
#[pyclass(name, traverse)]
#[pyclass(module = "sqlite3", name = "Blob", traverse)]
#[derive(Debug, PyPayload)]
struct Blob {
connection: PyRef<Connection>,
#[pytraverse(skip)]
inner: PyMutex<Option<BlobInner>>,
}

impl Unconstructible for Blob {}

#[derive(Debug)]
struct BlobInner {
blob: SqliteBlob,
Expand All @@ -2056,7 +2058,7 @@ mod _sqlite {
}
}

#[pyclass(with(AsMapping))]
#[pyclass(with(AsMapping, Unconstructible))]
impl Blob {
#[pymethod]
fn close(&self) {
Expand Down Expand Up @@ -2356,7 +2358,7 @@ mod _sqlite {
impl PrepareProtocol {}

#[pyattr]
#[pyclass(name)]
#[pyclass(module = "sqlite3", name = "Statement")]
#[derive(PyPayload)]
struct Statement {
st: PyMutex<SqliteStatement>,
Expand All @@ -2373,7 +2375,9 @@ mod _sqlite {
}
}

#[pyclass()]
impl Unconstructible for Statement {}

#[pyclass(with(Unconstructible))]
impl Statement {
fn new(
connection: &Connection,
Expand Down
2 changes: 1 addition & 1 deletion vm/src/types/slot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ pub trait DefaultConstructor: PyPayload + Default {
pub trait Unconstructible: PyPayload {
#[pyslot]
fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
Err(vm.new_type_error(format!("cannot create {} instances", cls.slot_name())))
Err(vm.new_type_error(format!("cannot create '{}' instances", cls.slot_name())))
}
}

Expand Down
Loading