~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/globbing.py

cleanup of globster code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
203
203
 
204
204
    def __init__(self, patterns):
205
205
        self._regex_patterns = []
206
 
        path_patterns = []
207
 
        base_patterns = []
208
 
        ext_patterns = []
209
206
        pattern_lists = {
210
 
            Globster.TYPE_FULLPATH : path_patterns,
211
 
            Globster.TYPE_EXTENSION : ext_patterns,
212
 
            Globster.TYPE_BASENAME : base_patterns,
 
207
            Globster.TYPE_FULLPATH : [],
 
208
            Globster.TYPE_EXTENSION : [],
 
209
            Globster.TYPE_BASENAME : [],
213
210
        }
214
211
        for pat in patterns:
215
212
            pat = normalize_pattern(pat)
216
213
            pattern_lists[Globster.identify(pat)].append(pat)
217
 
        for k, v in pattern_lists.iteritems():
218
 
            self._add_patterns(v, Globster.translators[k],
219
 
                Globster.prefixes[k])
 
214
        for pattern_type, patterns in pattern_lists.iteritems():
 
215
            self._add_patterns(patterns,
 
216
                Globster.translators[pattern_type],
 
217
                Globster.prefixes[pattern_type])
220
218
 
221
219
    def _add_patterns(self, patterns, translator, prefix=''):
222
220
        while patterns: