diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-03-30 22:01:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 22:01:53 -0400 |
| commit | b3d7759dd27f0ba8aa00bb542054652bb3d3d74a (patch) | |
| tree | eb55dbd98281199ad82d1c17ce0d67c30fc1ac37 /setuptools/command/install_scripts.py | |
| parent | 6dffcbe97d556809788afb8bed66ac4860c0d939 (diff) | |
| parent | 5d60ccefb48329b7cedfe6d78fc1cb95683104b6 (diff) | |
| download | python-setuptools-git-b3d7759dd27f0ba8aa00bb542054652bb3d3d74a.tar.gz | |
Merge pull request #2566 from hroncok/remove_bdist_wininst
Remove bdist_wininst, Filter out distutils deprecation
Diffstat (limited to 'setuptools/command/install_scripts.py')
| -rw-r--r-- | setuptools/command/install_scripts.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py index 8c9a15e2..9cd8eb06 100644 --- a/setuptools/command/install_scripts.py +++ b/setuptools/command/install_scripts.py @@ -1,5 +1,6 @@ from distutils import log import distutils.command.install_scripts as orig +from distutils.errors import DistutilsModuleError import os import sys @@ -35,7 +36,7 @@ class install_scripts(orig.install_scripts): try: bw_cmd = self.get_finalized_command("bdist_wininst") is_wininst = getattr(bw_cmd, '_is_running', False) - except ImportError: + except (ImportError, DistutilsModuleError): is_wininst = False writer = ei.ScriptWriter if is_wininst: |