Fix type errors

Now that we run mypy in tox, a few files needed adjustments to make the
check pass.

Author: lkollar

auditwheel/lddtree.py

@@ -183,7 +183,7 @@ def load_ld_paths(root: str = '/', prefix: str = '') -> Dict[str, List[str]]:
     -------
     dict containing library paths to search
     """
-    ldpaths = {'conf': [], 'env': [], 'interp': []}
+    ldpaths = {'conf': [], 'env': [], 'interp': []}  # type: Dict
 
     # Load up $LD_LIBRARY_PATH.
     env_ldpath = os.environ.get('LD_LIBRARY_PATH')
@@ -312,9 +312,12 @@ def lddtree(path: str,
       },
     }
     """
+    if not ldpaths:
+        ldpaths = load_ld_paths().copy()
+
     if _first:
         _all_libs = {}
-        ldpaths = load_ld_paths().copy()
+
     ret = {
         'interp': None,
         'path': path if display is None else display,

auditwheel/main_show.py

@@ -1,9 +1,6 @@
 import logging
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    from collections import OrderedDict
+from collections import OrderedDict
 
 logger = logging.getLogger(__name__)
 

auditwheel/policy/external_references.py

@@ -54,7 +54,7 @@ def get_req_external(libs: Set[str], whitelist: Set[str]):
             whitelist = set(p['lib_whitelist'])
             needed_external_libs = get_req_external(
                 set(filter_libs(lddtree['needed'], whitelist)),
-                whitelist)  # type: List[str]
+                whitelist)
 
         pol_ext_deps = {}
         for lib in needed_external_libs:

auditwheel/repair.py

@@ -6,7 +6,7 @@
 import shutil
 from os.path import exists, basename, abspath, isabs
 from os.path import join as pjoin
-from typing import Dict, Optional
+from typing import Dict, Optional, Tuple
 
 from auditwheel.patcher import ElfPatcher
 from .elfutils import elf_read_rpaths, elf_read_dt_needed
@@ -32,9 +32,9 @@ def repair_wheel(wheel_path: str, abi: str, lib_sdir: str, out_dir: str,
 
     # Do not repair a pure wheel, i.e. has no external refs
     if not external_refs_by_fn:
-        return
+        return None
 
-    soname_map = {}  # type: Dict[str, str]
+    soname_map = {}  # type: Dict[str, Tuple[str, str]]
     if not isabs(out_dir):
         out_dir = abspath(out_dir)
 
@@ -43,7 +43,12 @@ def repair_wheel(wheel_path: str, abi: str, lib_sdir: str, out_dir: str,
     with InWheelCtx(wheel_path) as ctx:
         ctx.out_wheel = pjoin(out_dir, wheel_fname)
 
-        dest_dir = WHEEL_INFO_RE(wheel_fname).group('name') + lib_sdir
+        match = WHEEL_INFO_RE(wheel_fname)
+        if not match:
+            raise ValueError("Failed to parse wheel file name: %s",
+                             wheel_fname)
+
+        dest_dir = match.group('name') + lib_sdir
 
         if not exists(dest_dir):
             os.mkdir(dest_dir)