mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 02:10:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#2234 distutils failed with mingw binutils 2.18.50.20080109.

Browse source 
Be less strict when parsing these version numbers,
they don't necessarily follow the python numbering scheme.
This commit is contained in:
Amaury Forgeot d'Arc 2008-08-18 19:23:47 +00:00
parent 26f521668a
commit 351ffb80c3
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/distutils/cygwinccompiler.py
View file

@ -404,7 +404,7 @@ def get_versions():
""" Try to find out the versions of gcc, ld and dllwrap.
If not possible it returns None for it.
"""
from distutils.version import StrictVersion
from distutils.version import LooseVersion
from distutils.spawn import find_executable
import re
@ -415,7 +415,7 @@ def get_versions():
out.close()
result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
if result:
gcc_version = StrictVersion(result.group(1))
gcc_version = LooseVersion(result.group(1))
else:
gcc_version = None
else:
@ -427,7 +427,7 @@ def get_versions():
out.close()
result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
if result:
ld_version = StrictVersion(result.group(1))
ld_version = LooseVersion(result.group(1))
else:
ld_version = None
else:
@ -439,7 +439,7 @@ def get_versions():
out.close()
result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
if result:
dllwrap_version = StrictVersion(result.group(1))
dllwrap_version = LooseVersion(result.group(1))
else:
dllwrap_version = None
else: