remove dedent, fix whitespace, use bool

hauntsaninja · Jan 28, 2024 · 47d7f6c · 47d7f6c
1 parent 24ccd8a
commit 47d7f6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
@@ -818,7 +818,7 @@ def test_cwd_script_shadowing_stdlib(self):
                 collections.does_not_exist
 
     def test_shadowing_stdlib_sys_edge_cases(self):
-        program = textwrap.dedent('''
+        program = '''
 import collections
 import os
 import types
@@ -845,7 +845,7 @@ class substr(str):
     collections.does_not_exist
 except AttributeError as e:
     print(str(e))
-''')
+'''
         popen = script_helper.spawn_python('-c', program)
         stdout, stderr = popen.communicate()
         self.assertEqual(stdout.splitlines(), [

diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -853,7 +853,7 @@ _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress)
         }
     }
 
-    int is_script_shadowing_stdlib = 0;
+    bool is_script_shadowing_stdlib = 0;
     // Check mod.__name__ in sys.stdlib_module_names
     // and os.path.dirname(mod.__spec__.origin) == os.getcwd()
     if (origin) {
@@ -862,7 +862,7 @@ _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress)
             int rc = PySet_Contains(stdlib, mod_name);
             if (rc == 1) {
                 wchar_t cwd[MAXPATHLEN], origin_dirname[MAXPATHLEN];
-                if(_Py_wgetcwd(cwd, MAXPATHLEN)) {
+                if (_Py_wgetcwd(cwd, MAXPATHLEN)) {
                     if (PyUnicode_AsWideChar(origin, origin_dirname, MAXPATHLEN) < 0) {
                         goto done;
                     }