chore: resolve review comment

Author: fatelei

Lib/test/test_ordered_dict.py

@@ -993,8 +993,8 @@ def test_copy_concurrent_deletion_by_del_in__getitem__(self):
         class MyOD(self.OrderedDict):
             call_count = 0
             def __getitem__(self, key):
-                MyOD.call_count += 1
-                if MyOD.call_count == 1:
+                self.call_count += 1
+                if self.call_count == 1:
                     del self[3]
                 return super().__getitem__(key)
 
@@ -1005,9 +1005,9 @@ def test_copy_concurrent_deletion_by_pop_in__getitem__(self):
         class MyOD(self.OrderedDict):
             call_count = 0
             def __getitem__(self, key):
-                MyOD.call_count += 1
-                if MyOD.call_count == 1:
-                    self.pop(3, None)
+                self.call_count += 1
+                if self.call_count == 1:
+                    self.pop(3)
                 return super().__getitem__(key)
 
         od = MyOD([(1, 'one'), (2, 'two'), (3, 'three')])
@@ -1017,10 +1017,10 @@ def test_copy_concurrent_deletion_and_set_in__getitem__(self):
         class MyOD(self.OrderedDict):
             call_count = 0
             def __getitem__(self, key):
-                MyOD.call_count += 1
-                if MyOD.call_count == 1:
+                self.call_count += 1
+                if self.call_count == 1:
                     del self[3]
-                elif MyOD.call_count == 2:
+                elif self.call_count == 2:
                     self['new_key'] = 'new_value'
                 return super().__getitem__(key)
 
@@ -1029,11 +1029,12 @@ def __getitem__(self, key):
 
     def test_copy_concurrent_mutation_in__setitem__(self):
         od = None
-
         class MyOD(self.OrderedDict):
+            call_count = 0
             def __setitem__(self, key, value):
-                if od is not None and len(od) > 1:
-                    del od[3]
+                self.call_count += 1
+                if od is not None and len(od) > 1 and self.call_count == 1:
+                    del od[1]
                 return super().__setitem__(key, value)
 
         od = MyOD([(1, 'one'), (2, 'two'), (3, 'three')])

Objects/odictobject.c

@@ -1268,15 +1268,18 @@ OrderedDict_copy_impl(PyObject *od)
     else {
         PyODictObject *self = _PyODictObject_CAST(od);
         size_t state = self->od_state;
-        _ODictNode *cur;
 
-        _odict_FOREACH(od, cur) {
-            PyObject *key = Py_NewRef(_odictnode_KEY(cur));
+        _odict_FOREACH(od, node) {
+            PyObject *key = Py_NewRef(_odictnode_KEY(node));
             PyObject *value = PyObject_GetItem(od, key);
             if (value == NULL) {
                 Py_DECREF(key);
+                if (self->od_state != state) {
+                    goto invalid_state;
+                }
                 goto fail;
             }
+
             int rc = PyObject_SetItem(od_copy, key, value);
             Py_DECREF(key);
             Py_DECREF(value);