RustPython
diff --git a/‎Lib/test/test_itertools.py
Lines changed: 0 additions & 4 deletions b/‎Lib/test/test_itertools.py
Lines changed: 0 additions & 4 deletions
diff --git a/‎vm/src/stdlib/itertools.rs
Lines changed: 15 additions & 2 deletions b/‎vm/src/stdlib/itertools.rs
Lines changed: 15 additions & 2 deletions
@@ -1182,8 +1182,6 @@ def test_pairwise(self):
         with self.assertRaises(TypeError):
             pairwise(None)                                  # non-iterable argument
 
-    # TODO: RUSTPYTHON
-    @unittest.skip("TODO: RUSTPYTHON, hangs")
     def test_pairwise_reenter(self):
         def check(reenter_at, expected):
             class I:
@@ -1234,8 +1232,6 @@ def __next__(self):
             ([5], [6]),
         ])
 
-    # TODO: RUSTPYTHON
-    @unittest.skip("TODO: RUSTPYTHON, hangs")
     def test_pairwise_reenter2(self):
         def check(maxcount, expected):
             class I:
 
@@ -1922,12 +1922,25 @@ mod decl {
 
     impl IterNext for PyItertoolsPairwise {
         fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
-            let old = match zelf.old.read().clone() {
-                None => handle_pyiter_return!(zelf.iterator.next(vm)?),
+            let old_clone = {
+                let guard = zelf.old.read();
+                guard.clone()
+            };
+            let old = match old_clone {
+                None => match zelf.iterator.next(vm)? {
+                    PyIterReturn::Return(obj) => {
+                        // Needed for when we reenter
+                        *zelf.old.write() = Some(obj.clone());
+                        obj
+                    }
+                    PyIterReturn::StopIteration(v) => return Ok(PyIterReturn::StopIteration(v)),
+                },
                 Some(obj) => obj,
             };
+
             let new = handle_pyiter_return!(zelf.iterator.next(vm)?);
             *zelf.old.write() = Some(new.clone());
+
             Ok(PyIterReturn::Return(vm.new_tuple((old, new)).into()))
         }
     }