summaryrefslogtreecommitdiff
path: root/django/utils/functional.py
diff options
context:
space:
mode:
authorДилян Палаузов <Dilyan.Palauzov@db.com>2017-12-27 00:14:12 +0530
committerTim Graham <timograham@gmail.com>2017-12-26 17:11:15 -0500
commit4c599ece57fa009cf3615f09497f81bfa6a585a7 (patch)
tree1f27a7e76024aaa5bc69356826061262d35d0be3 /django/utils/functional.py
parentc21f158295d92e35caf96436bfdbbff554fc5569 (diff)
downloaddjango-4c599ece57fa009cf3615f09497f81bfa6a585a7.tar.gz
Fixed #28930 -- Simplified code with any() and all().
Diffstat (limited to 'django/utils/functional.py')
-rw-r--r--django/utils/functional.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/django/utils/functional.py b/django/utils/functional.py
index 0da1fffa2b..146a2e8dc2 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -190,12 +190,9 @@ def keep_lazy(*resultclasses):
@wraps(func)
def wrapper(*args, **kwargs):
- for arg in itertools.chain(args, kwargs.values()):
- if isinstance(arg, Promise):
- break
- else:
- return func(*args, **kwargs)
- return lazy_func(*args, **kwargs)
+ if any(isinstance(arg, Promise) for arg in itertools.chain(args, kwargs.values())):
+ return lazy_func(*args, **kwargs)
+ return func(*args, **kwargs)
return wrapper
return decorator