# HG changeset patch # User Gilles Duboscq # Date 1363701358 -3600 # Node ID d1d486c03e8a8564faeaa003b4d0acf3c1072fae # Parent acc24060b64ff737a2d185c39bef3ba4400cdf67 Fix version parsing in mx diff -r acc24060b64f -r d1d486c03e8a mxtool/mx.py --- a/mxtool/mx.py Mon Mar 18 14:45:36 2013 +0100 +++ b/mxtool/mx.py Tue Mar 19 14:55:58 2013 +0100 @@ -1061,11 +1061,11 @@ class JavaVersion: def __init__(self, versionString): validChar = '[\x21-\x25\x27-\x29\x2c\x2f-\x5e\x60-\x7f]' - separator = '[.-_]' + separator = '[.\-_]' m = re.match(validChar + '+(' + separator + validChar + '+)*', versionString) assert m is not None, 'not a recognized version string: ' + versionString self.versionString = versionString; - self.parts = versionString.split(separator) + self.parts = [int(f) if f.isdigit() else f for f in re.split(separator, versionString)] def __str__(self): return self.versionString