Just use get() instead of pop()

Now that these are functions we don't need to
destroy the incoming configuration dictionary
by popping things from it.

Change-Id: I5d0ff032f0e7c9e79d39c3f5d533c43801502a8c
This commit is contained in:
Joshua Harlow 2014-09-08 11:47:28 -07:00
parent 355029419e
commit 87bcf0bb32
1 changed files with 4 additions and 4 deletions

View File

@ -151,10 +151,10 @@ def setup_logging(verbose):
def scan(cfg):
print("Scanning...")
files = collections.deque()
ignored_paths = cfg.pop('ignore_path')
ignored_paths = cfg.get('ignore_path', [])
files_ignored = 0
file_iter = utils.find_files(cfg.pop('paths', []),
cfg.pop('extension', []), ignored_paths)
file_iter = utils.find_files(cfg.get('paths', []),
cfg.get('extension', []), ignored_paths)
for filename, ignoreable in file_iter:
if ignoreable:
files_ignored += 1
@ -170,7 +170,7 @@ def scan(cfg):
def validate(cfg, files):
print("Validating...")
error_counts = {}
ignoreables = frozenset(cfg.pop('ignore', []))
ignoreables = frozenset(cfg.get('ignore', []))
while files:
f = files.popleft()
if cfg.get('verbose'):