mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

modify regular expression globbing

Browse source
This commit is contained in:
adam j hartz 2016-03-07 00:03:34 -05:00
parent 033e767078
commit ae92455ff5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xonsh/built_ins.py
View file

@ -253,12 +253,12 @@ def reglob(path, parts=None, i=None):
if i1 == len(parts):
for f in files:
p = os.path.join(base, f)
if regex.match(p) is not None:
if regex.fullmatch(p) is not None:
paths.append(p)
else:
for f in files:
p = os.path.join(base, f)
if regex.match(p) is None or not os.path.isdir(p):
if regex.fullmatch(p) is None or not os.path.isdir(p):
continue
paths += reglob(p, parts=parts, i=i1)
return paths
@ -269,7 +269,8 @@ def regexpath(s):
paths that match the regex.
"""
s = expand_path(s)
return reglob(s)
o = reglob(s)
return o if len(o) != 0 else [s]
def globpath(s, ignore_case=False):