Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(20)

Delta Between Two Patch Sets: Lib/glob.py

Issue 3055: combined patches from http://bugs.python.org/issue3187 (Closed) SVN Base: http://svn.python.org/view/*checkout*/python/branches/py3k/
Left Patch Set: Number 3 from Victor Created 1 year, 1 month ago , Downloaded from: http://bugs.python.org/file11680/python3_bytes_filename-3.patch
Right Patch Set: One more tweak (fold some long lines) Created 1 year, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 """Filename globbing utility.""" 1 """Filename globbing utility."""
2 2
3 import sys 3 import sys
4 import os 4 import os
5 import re 5 import re
6 import fnmatch 6 import fnmatch
7 7
8 __all__ = ["glob", "iglob"] 8 __all__ = ["glob", "iglob"]
9 9
10 def glob(pathname): 10 def glob(pathname):
(...skipping 30 matching lines...) Expand all
41 for dirname in dirs: 41 for dirname in dirs:
42 for name in glob_in_dir(dirname, basename): 42 for name in glob_in_dir(dirname, basename):
43 yield os.path.join(dirname, name) 43 yield os.path.join(dirname, name)
44 44
45 # These 2 helper functions non-recursively glob inside a literal directory. 45 # These 2 helper functions non-recursively glob inside a literal directory.
46 # They return a list of basenames. `glob1` accepts a pattern while `glob0` 46 # They return a list of basenames. `glob1` accepts a pattern while `glob0`
47 # takes a literal basename (so it only has to check for its existence). 47 # takes a literal basename (so it only has to check for its existence).
48 48
49 def glob1(dirname, pattern): 49 def glob1(dirname, pattern):
50 if not dirname: 50 if not dirname:
51 if isinstance(pattern, (bytes, bytearray)): 51 if isinstance(pattern, bytes):
52 dirname = bytes(os.curdir, 'ASCII') 52 dirname = bytes(os.curdir, 'ASCII')
53 else: 53 else:
54 dirname = os.curdir 54 dirname = os.curdir
55 try: 55 try:
56 names = os.listdir(dirname) 56 names = os.listdir(dirname)
57 except os.error: 57 except os.error:
58 return [] 58 return []
59 if pattern[0] != '.': 59 if pattern[0] != '.':
60 names = [x for x in names if x[0] != '.'] 60 names = [x for x in names if x[0] != '.']
61 return fnmatch.filter(names, pattern) 61 return fnmatch.filter(names, pattern)
62 62
63 def glob0(dirname, basename): 63 def glob0(dirname, basename):
64 if basename == '': 64 if basename == '':
65 # `os.path.split()` returns an empty basename for paths ending with a 65 # `os.path.split()` returns an empty basename for paths ending with a
66 # directory separator. 'q*x/' should match only directories. 66 # directory separator. 'q*x/' should match only directories.
67 if os.path.isdir(dirname): 67 if os.path.isdir(dirname):
68 return [basename] 68 return [basename]
69 else: 69 else:
70 if os.path.lexists(os.path.join(dirname, basename)): 70 if os.path.lexists(os.path.join(dirname, basename)):
71 return [basename] 71 return [basename]
72 return [] 72 return []
73 73
74 74
75 magic_check = re.compile('[*?[]') 75 magic_check = re.compile('[*?[]')
76 magic_check_bytes = re.compile(b'[*?[]') 76 magic_check_bytes = re.compile(b'[*?[]')
77 77
78 def has_magic(s): 78 def has_magic(s):
79 if isinstance(s, (bytes, bytearray)): 79 if isinstance(s, bytes):
80 match = magic_check_bytes.search(s) 80 match = magic_check_bytes.search(s)
81 else: 81 else:
82 match = magic_check.search(s) 82 match = magic_check.search(s)
83 return match is not None 83 return match is not None
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld r483