Apply suggestions from code review

Co-authored-by: Victor Stinner <[email protected]>
skirpichev · Aug 24, 2023 · 058412e · 058412e
1 parent 048d8bf
commit 058412e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Lib/test/test_module/__init__.py b/Lib/test/test_module/__init__.py
@@ -159,6 +159,7 @@ def test_module_setattr(self):
             gsa.foo = 2
         gsa.bar = 3
         self.assertEqual(gsa.bar, 3)
+        del sys.modules['test.test_module.good_setattr']
 
     def test_module_setattr_errors(self):
         import test.test_module.bad_setattr as bsa
@@ -170,7 +171,8 @@ def test_module_setattr_errors(self):
         with self.assertRaises(TypeError):
             bad_setattr2.foo = 2
         del sys.modules['test.test_module.bad_setattr']
-        del sys.modules['test.test_module.bad_setattr2']
+        if 'test.test_module.bad_setattr2' in sys.modules:
+            del sys.modules['test.test_module.bad_setattr2']
 
     def test_module_delattr(self):
         import test.test_module.good_delattr as gda
@@ -195,7 +197,8 @@ def test_module_delattr_errors(self):
         with self.assertRaises(TypeError):
             del bad_delattr2.foo
         del sys.modules['test.test_module.bad_delattr']
-        del sys.modules['test.test_module.bad_delattr2']
+        if 'test.test_module.bad_delattr2' in sys.modules:
+            del sys.modules['test.test_module.bad_delattr2']
 
     def test_module_dir(self):
         import test.test_module.good_getattr as gga

diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -884,7 +884,8 @@ module_setattro(PyModuleObject *mod, PyObject *name, PyObject *value)
             Py_DECREF(res);
             return 0;
         }
-    } else {
+    }
+    else {
         PyObject *delattr;
         if (PyDict_GetItemRef(mod->md_dict, &_Py_ID(__delattr__), &delattr) < 0) {
             return -1;