Merge branch 'RustPython:main' into main

sthagen · web-flow · commit 5c84fb791693 · 2025-07-28T19:10:26.000+02:00
diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py
@@ -1452,8 +1452,6 @@ class DummyException(Exception):
                 raise DummyException("reraised")
 
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_blob_closed(self):
         with memory_database() as cx:
             cx.execute("create table test(b blob)")
diff --git a/stdlib/src/sqlite.rs b/stdlib/src/sqlite.rs
@@ -2145,13 +2145,16 @@ mod _sqlite {
         }
 
         #[pymethod]
-        fn __enter__(zelf: PyRef<Self>) -> PyRef<Self> {
-            zelf
+        fn __enter__(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
+            let _ = zelf.inner(vm)?;
+            Ok(zelf)
         }
 
         #[pymethod]
-        fn __exit__(&self, _args: FuncArgs) {
-            self.close()
+        fn __exit__(&self, _args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> {
+            let _ = self.inner(vm)?;
+            self.close();
+            Ok(())
         }
 
         fn inner(&self, vm: &VirtualMachine) -> PyResult<PyMappedMutexGuard<'_, BlobInner>> {
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
@@ -666,6 +666,7 @@ mod decl {
         }
     }
 
+    #[derive(Default)]
     struct GroupByState {
         current_value: Option<PyObjectRef>,
         current_key: Option<PyObjectRef>,
@@ -729,12 +730,7 @@ mod decl {
             Self {
                 iterable,
                 key_func: key.flatten(),
-                state: PyMutex::new(GroupByState {
-                    current_key: None,
-                    current_value: None,
-                    next_group: false,
-                    grouper: None,
-                }),
+                state: PyMutex::new(GroupByState::default()),
             }
             .into_ref_with_type(vm, cls)
             .map(Into::into)

Original file line number	Diff line number	Diff line change
`@@ -2145,13 +2145,16 @@ mod _sqlite {`
`2145`	`2145`	`}`
`2146`	`2146`
`2147`	`2147`	`#[pymethod]`
`2148`		`- fn __enter__(zelf: PyRef<Self>) -> PyRef<Self> {`
`2149`		`- zelf`
	`2148`	`+ fn __enter__(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {`
	`2149`	`+ let _ = zelf.inner(vm)?;`
	`2150`	`+ Ok(zelf)`
`2150`	`2151`	`}`
`2151`	`2152`
`2152`	`2153`	`#[pymethod]`
`2153`		`- fn __exit__(&self, _args: FuncArgs) {`
`2154`		`- self.close()`
	`2154`	`+ fn __exit__(&self, _args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> {`
	`2155`	`+ let _ = self.inner(vm)?;`
	`2156`	`+ self.close();`
	`2157`	`+ Ok(())`
`2155`	`2158`	`}`
`2156`	`2159`
`2157`	`2160`	`fn inner(&self, vm: &VirtualMachine) -> PyResult<PyMappedMutexGuard<'_, BlobInner>> {`