traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Never return a non-existing pathname. 

Rewrote has_magic using a regular expression match.
This commit is contained in:
Guido van Rossum 1992-01-12 23:32:11 +00:00
parent 05e5219f53
commit c2ef5c2ded
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/glob.py
View File

@ -2,10 +2,15 @@
import os import os
import fnmatch import fnmatch
import regex
def glob(pathname): def glob(pathname):
if not has_magic(pathname): return [pathname] if not has_magic(pathname):
if os.path.exists(pathname):
return [pathname]
else:
return []
dirname, basename = os.path.split(pathname) dirname, basename = os.path.split(pathname)
if has_magic(dirname): if has_magic(dirname):
list = glob(dirname) list = glob(dirname)
@ -34,9 +39,13 @@ def glob1(dirname, pattern):
return [] return []
result = [] result = []
for name in names: for name in names:
if name[0] <> '.' or pattern[0] == '.': if name[0] != '.' or pattern[0] == '.':
if fnmatch.fnmatch(name, pattern): result.append(name) if fnmatch.fnmatch(name, pattern):
result.append(name)
return result return result
magic_check = regex.compile('[*?[]')
def has_magic(s): def has_magic(s):
return '*' in s or '?' in s or '[' in s return magic_check.search(s) >= 0