From 237a35fe8841475b944374b45039f040d75ade09 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Sat, 9 Jan 2016 21:14:36 -0600 Subject: [PATCH] Simplify normalize_paths --- flake8/options/manager.py | 1 - flake8/utils.py | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/flake8/options/manager.py b/flake8/options/manager.py index 38eb605..723a700 100644 --- a/flake8/options/manager.py +++ b/flake8/options/manager.py @@ -167,7 +167,6 @@ def _normalize_option(options, option): if option.comma_separated_list: normalize = utils.normalize_paths setattr(options, dest, normalize(old_value)) - elif option.comma_separated_list: old_value = getattr(options, dest) setattr(options, dest, diff --git a/flake8/utils.py b/flake8/utils.py index 72c7852..0dc16e2 100644 --- a/flake8/utils.py +++ b/flake8/utils.py @@ -29,12 +29,7 @@ def normalize_paths(paths, parent=os.curdir): :rtype: [str] """ - paths = [] - for path in parse_comma_separated_list(paths): - if '/' in path: - path = os.path.abspath(os.path.join(parent, path)) - paths.append(path.rstrip('/')) - return paths + return [normalize_path(p) for p in parse_comma_separated_list(paths)] def normalize_path(path, parent=os.curdir): @@ -47,4 +42,4 @@ def normalize_path(path, parent=os.curdir): """ if '/' in path: path = os.path.abspath(os.path.join(parent, path)) - return path + return path.rstrip('/')