Commit 677cbea5 authored by Benjamin Peterson's avatar Benjamin Peterson

Merged revisions 65780,65782,65785,65809,65812,65834,65846,65859,65861 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65780 | antoine.pitrou | 2008-08-17 15:15:07 -0500 (Sun, 17 Aug 2008) | 3 lines

  #3580: fix a failure in test_os
........
  r65782 | benjamin.peterson | 2008-08-17 15:33:45 -0500 (Sun, 17 Aug 2008) | 1 line

  set svn:executable on a script
........
  r65785 | amaury.forgeotdarc | 2008-08-17 16:05:18 -0500 (Sun, 17 Aug 2008) | 3 lines

  Fix a refleak in bytearray.split and bytearray.rsplit, detected by
     regrtest.py -R:: test_bytes
........
  r65809 | nick.coghlan | 2008-08-18 07:42:46 -0500 (Mon, 18 Aug 2008) | 1 line

  Belated NEWS entry for r65642
........
  r65812 | nick.coghlan | 2008-08-18 08:32:19 -0500 (Mon, 18 Aug 2008) | 1 line

  Fix typo
........
  r65834 | amaury.forgeotdarc | 2008-08-18 14:23:47 -0500 (Mon, 18 Aug 2008) | 4 lines

  #2234 distutils failed with mingw binutils 2.18.50.20080109.
  Be less strict when parsing these version numbers,
  they don't necessarily follow the python numbering scheme.
........
  r65846 | georg.brandl | 2008-08-18 18:09:49 -0500 (Mon, 18 Aug 2008) | 2 lines

  Fix grammar.
........
  r65859 | thomas.heller | 2008-08-19 12:47:13 -0500 (Tue, 19 Aug 2008) | 2 lines

  Fix strange character in the docstring.
........
  r65861 | benjamin.peterson | 2008-08-19 12:59:23 -0500 (Tue, 19 Aug 2008) | 1 line

  get unparse to at least unparse its self
........
parent 9b46d3fc
...@@ -400,7 +400,7 @@ def get_versions(): ...@@ -400,7 +400,7 @@ def get_versions():
""" Try to find out the versions of gcc, ld and dllwrap. """ Try to find out the versions of gcc, ld and dllwrap.
If not possible it returns None for it. If not possible it returns None for it.
""" """
from distutils.version import StrictVersion from distutils.version import LooseVersion
from distutils.spawn import find_executable from distutils.spawn import find_executable
import re import re
...@@ -411,7 +411,7 @@ def get_versions(): ...@@ -411,7 +411,7 @@ def get_versions():
out.close() out.close()
result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII) result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
if result: if result:
gcc_version = StrictVersion(result.group(1)) gcc_version = LooseVersion(result.group(1))
else: else:
gcc_version = None gcc_version = None
else: else:
...@@ -423,7 +423,7 @@ def get_versions(): ...@@ -423,7 +423,7 @@ def get_versions():
out.close() out.close()
result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII) result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
if result: if result:
ld_version = StrictVersion(result.group(1)) ld_version = LooseVersion(result.group(1))
else: else:
ld_version = None ld_version = None
else: else:
...@@ -435,7 +435,7 @@ def get_versions(): ...@@ -435,7 +435,7 @@ def get_versions():
out.close() out.close()
result = re.search(' (\d+\.\d+(\.\d+)*)', out_string, re.ASCII) result = re.search(' (\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
if result: if result:
dllwrap_version = StrictVersion(result.group(1)) dllwrap_version = LooseVersion(result.group(1))
else: else:
dllwrap_version = None dllwrap_version = None
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment