@@ -41,14 +41,14 @@ def make_batch_determiner(whitelist=None, blacklist=None, include_matcher=None,
4141 # import everything but the blacklist
4242 if exclude_matcher :
4343 excluder = _compile_regexes (exclude_matcher )
44- return lambda typename : typename not in black_set and not match_regex_list (excluder , typename )
44+ return lambda typename : typename not in black_set and not _match_regex_list (excluder , typename )
4545 else :
4646 return lambda typename : typename not in black_set
4747 elif has_whitelist and not blacklist :
4848 # only import the whitelist
4949 if include_matcher :
5050 includer = _compile_regexes (include_matcher )
51- return lambda typename : typename in white_set or match_regex_list (includer , typename )
51+ return lambda typename : typename in white_set or _match_regex_list (includer , typename )
5252 else :
5353 return lambda x : x in white_set
5454 elif has_whitelist and has_blacklist :
@@ -57,15 +57,15 @@ def make_batch_determiner(whitelist=None, blacklist=None, include_matcher=None,
5757 excluder = _compile_regexes (exclude_matcher )
5858 includer = _compile_regexes (include_matcher )
5959 def fn (typename ):
60- in_white = (typename in white_set or match_regex_list (includer , typename ))
61- not_black = (typename not in black_set and not match_regex_list (excluder , typename ))
60+ in_white = (typename in white_set or _match_regex_list (includer , typename ))
61+ not_black = (typename not in black_set and not _match_regex_list (excluder , typename ))
6262 return in_white and not_black
6363 elif exclude_matcher is not None :
6464 excluder = _compile_regexes (exclude_matcher )
65- return lambda x : x in white_set and not match_regex_list (excluder , x ) and x not in black_set
65+ return lambda x : x in white_set and not _match_regex_list (excluder , x ) and x not in black_set
6666 elif include_matcher :
6767 includer = _compile_regexes (include_matcher )
68- return lambda x : (x in white_set or match_regex_list (includer , x )) and x not in black_set
68+ return lambda x : (x in white_set or _match_regex_list (includer , x )) and x not in black_set
6969 else :
7070 return lambda x : typename in white_set and typename not in black_set
7171 else :
0 commit comments