]> granicus.if.org Git - python/commitdiff
Issue #13193: fix distutils.filelist.FileList under Windows
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Nov 2011 00:20:45 +0000 (01:20 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Nov 2011 00:20:45 +0000 (01:20 +0100)
Lib/distutils/filelist.py

index a94b5c8e9651cc8ab722e23b9f054080bb85663b..87b2cc6bc4756a57b71891c5a20effd2eea78807 100644 (file)
@@ -313,7 +313,10 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
-        pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
+        # match both path separators, as in Postel's principle
+        sep_pat = "[" + re.escape(os.path.sep + os.path.altsep
+                                  if os.path.altsep else os.path.sep) + "]"
+        pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re