Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-25 04:02:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix Python 3.6 support of utils.python.glob2re.

Browse Source
This commit is contained in:
Valentin Lorentz 2016-09-14 20:09:00 +02:00
parent b3bed0d6f9
commit 79bcc04d0a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils/python.py
View File

@ -108,11 +108,21 @@ class MetaSynchronized(type):
return newclass return newclass
Synchronized = MetaSynchronized('Synchronized', (), {}) Synchronized = MetaSynchronized('Synchronized', (), {})
# Translate glob to regular expression, trimming the "match EOL" portion of
# the regular expression.
# Post-2.6 uses \Z(?ms) per http://issues.python.org/6665
def glob2re(g): def glob2re(g):
return fnmatch.translate(g)[:-7] pattern = fnmatch.translate(g)
if pattern.startswith('(?s:') and pattern.endswith(')\\Z'):
# Python >= 3.6
return pattern[4:-3] + '\\Z'
elif pattern.endswith('\\Z(?ms)'):
# Python >= 2.6 and < 3.6
#
# Translate glob to regular expression, trimming the "match EOL"
# portion of the regular expression.
# Some Python versions use \Z(?ms) per
# https://bugs.python.org/issue6665
return pattern[:-7]
else:
assert False, 'Python < 2.6, or unknown behavior of fnmatch.translate.'
_debug_software_name = 'Limnoria' _debug_software_name = 'Limnoria'