mypy: Fix all union-attr

Author: Avasam

distutils/command/build_py.py

@@ -360,7 +360,7 @@ def build_modules(self) -> None:
             self.build_module(module, module_file, package)
 
     def build_packages(self) -> None:
-        for package in self.packages:
+        for package in self.packages or ():
             # Get list of (package, module, module_file) tuples based on
             # scanning the package directory.  'package' is only included
             # in the tuple so that 'find_modules()' and

distutils/dist.py

@@ -1198,7 +1198,7 @@ def _read_list(name):
         self.description = _read_field('summary')
 
         if 'keywords' in msg:
-            self.keywords = _read_field('keywords').split(',')
+            self.keywords = _read_field('keywords').split(',')  # type:ignore[union-attr] # Manually checked
 
         self.platforms = _read_list('platform')
         self.classifiers = _read_list('classifier')

distutils/filelist.py

@@ -261,6 +261,7 @@ def include_pattern(
         # delayed loading of allfiles list
         if self.allfiles is None:
             self.findall()
+        assert self.allfiles is not None
 
         for name in self.allfiles:
             if pattern_re.search(name):

distutils/sysconfig.py

@@ -324,6 +324,16 @@ def customize_compiler(compiler: CCompiler) -> None:
             'AR',
             'ARFLAGS',
         )
+        assert isinstance(cc, str)
+        assert isinstance(cxx, str)
+        assert isinstance(cflags, str)
+        assert isinstance(ccshared, str)
+        assert isinstance(ldshared, str)
+        assert isinstance(ldcxxshared, str)
+        assert isinstance(shlib_suffix, str)
+        assert isinstance(ar_flags, str)
+        ar = os.environ.get('AR', ar)
+        assert isinstance(ar, str)
 
         cxxflags = cflags
 
@@ -354,8 +364,6 @@ def customize_compiler(compiler: CCompiler) -> None:
         ldshared = _add_flags(ldshared, 'CPP')
         ldcxxshared = _add_flags(ldcxxshared, 'CPP')
 
-        ar = os.environ.get('AR', ar)
-
         archiver = ar + ' ' + os.environ.get('ARFLAGS', ar_flags)
         cc_cmd = cc + ' ' + cflags
         cxx_cmd = cxx + ' ' + cxxflags

distutils/util.py

@@ -232,14 +232,9 @@ def grok_environment_error(exc: object, prefix: str = "error: ") -> str:
 
 
 # Needed by 'split_quoted()'
-_wordchars_re = _squote_re = _dquote_re = None
-
-
-def _init_regex():
-    global _wordchars_re, _squote_re, _dquote_re
-    _wordchars_re = re.compile(rf'[^\\\'\"{string.whitespace} ]*')
-    _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
-    _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
+_wordchars_re = re.compile(rf'[^\\\'\"{string.whitespace} ]*')
+_squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
+_dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
 
 
 def split_quoted(s: str) -> list[str]:
@@ -256,15 +251,14 @@ def split_quoted(s: str) -> list[str]:
     # This is a nice algorithm for splitting up a single string, since it
     # doesn't require character-by-character examination.  It was a little
     # bit of a brain-bender to get it working right, though...
-    if _wordchars_re is None:
-        _init_regex()
 
     s = s.strip()
     words = []
     pos = 0
 
     while s:
         m = _wordchars_re.match(s, pos)
+        assert m is not None
         end = m.end()
         if end == len(s):
             words.append(s[:end])
@@ -305,9 +299,6 @@ def split_quoted(s: str) -> list[str]:
     return words
 
 
-# split_quoted ()
-
-
 def execute(
     func: Callable[[Unpack[_Ts]], object],
     args: tuple[Unpack[_Ts]],

mypy.ini

@@ -29,7 +29,6 @@ disable_error_code =
 	call-overload,
 	index,
 	func-returns-value,
-	union-attr,
 	str-bytes-safe,
 	misc,