Skip to content

sqlite3: fix isolation_level TypeError message to match CPython #8313

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 1 commit into from
Jul 19, 2026
Merged

sqlite3: fix isolation_level TypeError message to match CPython #8313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Lib/test/test_sqlite3/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ def test_convert_timestamp_microsecond_padding(self):
datetime.datetime(2012, 4, 4, 15, 6, 0, 123456),
])

@unittest.expectedFailure # TODO: RUSTPYTHON; error message mismatch
def test_invalid_isolation_level_type(self):
# isolation level is a string, not an integer
regex = "isolation_level must be str or None"
Expand Down
31 changes: 22 additions & 9 deletions crates/stdlib/src/_sqlite3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mod _sqlite3 {
use rustpython_vm::{
__exports::paste,
AsObject, Py, PyAtomicRef, PyObject, PyObjectRef, PyPayload, PyRef, PyResult,
TryFromBorrowedObject, VirtualMachine, atomic_func,
TryFromBorrowedObject, TryFromObject, VirtualMachine, atomic_func,
builtins::{
PyBaseException, PyBaseExceptionRef, PyByteArray, PyBytes, PyDict, PyDictRef, PyFloat,
PyInt, PyIntRef, PyModule, PySlice, PyStr, PyStrRef, PyTuple, PyTupleRef, PyType,
Expand Down Expand Up @@ -330,6 +330,19 @@ mod _sqlite3 {
}
}

struct IsolationLevelArg(Option<PyStrRef>);

impl TryFromObject for IsolationLevelArg {
fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
if vm.is_none(&obj) {
return Ok(Self(None));
}
obj.downcast::<PyStr>()
.map(|s| Self(Some(s)))
.map_err(|_| vm.new_type_error("isolation_level must be str or None".to_owned()))
}
}

Comment thread
coderabbitai[bot] marked this conversation as resolved.
#[derive(FromArgs)]
struct ConnectArgs {
#[pyarg(any)]
Expand All @@ -338,8 +351,8 @@ mod _sqlite3 {
timeout: TimeoutSeconds,
#[pyarg(any, default = 0)]
detect_types: c_int,
#[pyarg(any, default = Some(vm.ctx.empty_str.to_owned()))]
isolation_level: Option<PyStrRef>,
#[pyarg(any, default = IsolationLevelArg(Some(vm.ctx.empty_str.to_owned())))]
isolation_level: IsolationLevelArg,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
#[pyarg(any, default = true)]
check_same_thread: bool,
#[pyarg(any, default = Connection::class(&vm.ctx).to_owned())]
Expand All @@ -356,7 +369,7 @@ mod _sqlite3 {

unsafe impl Traverse for ConnectArgs {
fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) {
self.isolation_level.traverse(tracer_fn);
self.isolation_level.0.traverse(tracer_fn);
self.factory.traverse(tracer_fn);
}
}
Expand Down Expand Up @@ -914,7 +927,7 @@ mod _sqlite3 {
db: PyMutex::new(db),
initialized: Radium::new(initialized),
detect_types: Radium::new(args.detect_types),
isolation_level: PyAtomicRef::from(args.isolation_level),
isolation_level: PyAtomicRef::from(args.isolation_level.0),
check_same_thread: Radium::new(args.check_same_thread),
thread_ident: PyMutex::new(std::thread::current().id()),
row_factory: PyAtomicRef::from(None),
Expand Down Expand Up @@ -970,7 +983,7 @@ mod _sqlite3 {
.store(check_same_thread, Ordering::Relaxed);
*zelf.autocommit.lock() = autocommit;
*zelf.thread_ident.lock() = std::thread::current().id();
let _ = unsafe { zelf.isolation_level.swap(isolation_level) };
let _ = unsafe { zelf.isolation_level.swap(isolation_level.0) };

let mut guard = zelf.db.lock();
*guard = Some(db);
Expand All @@ -996,7 +1009,7 @@ mod _sqlite3 {
let db = Sqlite::from(SqliteRaw::open(path.as_ptr(), args.uri, vm)?);
let timeout = (args.timeout.to_secs_f64() * 1000.0) as c_int;
db.busy_timeout(timeout);
if let Some(isolation_level) = &args.isolation_level {
if let Some(isolation_level) = &args.isolation_level.0 {
begin_statement_ptr_from_isolation_level(isolation_level, vm)?;
}
Ok(db)
Expand Down Expand Up @@ -1492,11 +1505,11 @@ mod _sqlite3 {
#[pygetset(setter)]
fn set_isolation_level(
&self,
value: PySetterValue<Option<PyStrRef>>,
value: PySetterValue<IsolationLevelArg>,
vm: &VirtualMachine,
) -> PyResult<()> {
match value {
PySetterValue::Assign(value) => {
PySetterValue::Assign(IsolationLevelArg(value)) => {
if let Some(val_str) = &value {
begin_statement_ptr_from_isolation_level(val_str, vm)?;
}
Expand Down
Loading