(original) (raw)

changeset: 1291:7d1a7251d771 branch: python3 parent: 1286:158697fd8fa1 parent: 1290:c82c97b2eae1 user: Éric Araujo merwok@netwok.org date: Mon Feb 27 12:29:18 2012 +0100 files: distutils2/manifest.py distutils2/tests/test_command_build_ext.py distutils2/tests/test_manifest.py distutils2/tests/test_util.py distutils2/version.py description: Merge fixes for #13974, #6884 and #11841 from default diff -r 158697fd8fa1 -r 7d1a7251d771 CHANGES.txt --- a/CHANGES.txt Wed Feb 15 17:39:48 2012 +0100 +++ b/CHANGES.txt Mon Feb 27 12:29:18 2012 +0100 @@ -166,6 +166,9 @@ script with pysetup create [éric] - #1326113: build_ext now correctly parses multiple values given to the --libraries option [éric] +- #13974: add test for util.set_platform [tshepang] +- #6884: Fix MANIFEST.in parsing bugs on Windows [éric, nadeem] +- #11841: Fix comparison bug with 'rc' versions [filip] 1.0a3 - 2010-10-08 diff -r 158697fd8fa1 -r 7d1a7251d771 CONTRIBUTORS.txt --- a/CONTRIBUTORS.txt Wed Feb 15 17:39:48 2012 +0100 +++ b/CONTRIBUTORS.txt Mon Feb 27 12:29:18 2012 +0100 @@ -69,3 +69,4 @@ - Vinay Sajip - Victor Stinner - Alexandre Vassalotti +- Nadeem Vawda diff -r 158697fd8fa1 -r 7d1a7251d771 distutils2/manifest.py --- a/distutils2/manifest.py Wed Feb 15 17:39:48 2012 +0100 +++ b/distutils2/manifest.py Mon Feb 27 12:29:18 2012 +0100 @@ -272,6 +272,7 @@ Return True if files are found. """ + # XXX docstring lying about what the special chars are? files_found = False pattern_re = _translate_pattern(pattern, anchor, prefix, is_regex) @@ -335,11 +336,14 @@ # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix, # and by extension they shouldn't match such "special characters" under # any OS. So change all non-escaped dots in the RE to match any - # character except the special characters. - # XXX currently the "special characters" are just slash -- i.e. this is - # Unix-only. - pattern_re = re.sub(r'((?/merwok@netwok.org