Move 'str' cast into the one place where it's needed and allow config…

…_vars to have None values.
pypa · Dec 23, 2021 · 56d267c · 56d267c
1 parent 9867e2e
commit 56d267c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/distutils/command/install.py b/distutils/command/install.py
@@ -408,8 +408,7 @@ def finalize_options(self):
                             'platlibdir': getattr(sys, 'platlibdir', 'lib'),
                             'implementation_lower': _get_implementation().lower(),
                             'implementation': _get_implementation(),
-                            # all values must be str; see #86
-                            'platsubdir': str(sysconfig.get_config_var('platsubdir')),
+                            'platsubdir': sysconfig.get_config_var('platsubdir'),
                            }
 
         if HAS_USER_SITE:
@@ -650,7 +649,7 @@ def create_home_path(self):
             return
         home = convert_path(os.path.expanduser("~"))
         for name, path in self.config_vars.items():
-            if path.startswith(home) and not os.path.isdir(path):
+            if str(path).startswith(home) and not os.path.isdir(path):
                 self.debug_print("os.makedirs('%s', 0o700)" % path)
                 os.makedirs(path, 0o700)