From 00709d704ee75ace99c4a81aa60e029caeeac387 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 25 Sep 2017 15:18:29 +0200 Subject: [PATCH] Merged startswith() calls. --- django/template/loader_tags.py | 2 +- django/urls/resolvers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py index 0393239a75..8fa3a14087 100644 --- a/django/template/loader_tags.py +++ b/django/template/loader_tags.py @@ -222,7 +222,7 @@ def construct_relative_path(current_template_name, relative_name): Convert a relative path (starting with './' or '../') to the full template name based on the current_template_name. """ - if not any(relative_name.startswith(x) for x in ["'./", "'../", '"./', '"../']): + if not relative_name.startswith(("'./", "'../", '"./', '"../')): # relative_name is a variable or a literal that doesn't contain a # relative path. return relative_name diff --git a/django/urls/resolvers.py b/django/urls/resolvers.py index 9ee96d38d1..4cd25ff075 100644 --- a/django/urls/resolvers.py +++ b/django/urls/resolvers.py @@ -119,7 +119,7 @@ class CheckURLMixin: # Skip check as it can be useful to start a URL pattern with a slash # when APPEND_SLASH=False. return [] - if any(regex_pattern.startswith(x) for x in ('/', '^/', '^\/')) and not regex_pattern.endswith('/'): + if regex_pattern.startswith(('/', '^/', '^\/')) and not regex_pattern.endswith('/'): warning = Warning( "Your URL pattern {} has a route beginning with a '/'. Remove this " "slash as it is unnecessary. If this pattern is targeted in an "