From 5e6be0ddb3bd6b6a51322135e91a360aa0aacbd3 Mon Sep 17 00:00:00 2001 From: Julien Cassette Date: Tue, 16 Nov 2021 21:40:34 +0100 Subject: [PATCH] Use short-circuit evaluation in AndQuery and OrQuery (fix #4145) --- beets/dbcore/query.py | 4 ++-- docs/changelog.rst | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/beets/dbcore/query.py b/beets/dbcore/query.py index e8e3d1f4a..96476a5b1 100644 --- a/beets/dbcore/query.py +++ b/beets/dbcore/query.py @@ -443,7 +443,7 @@ class AndQuery(MutableCollectionQuery): return self.clause_with_joiner('and') def match(self, item): - return all([q.match(item) for q in self.subqueries]) + return all(q.match(item) for q in self.subqueries) class OrQuery(MutableCollectionQuery): @@ -453,7 +453,7 @@ class OrQuery(MutableCollectionQuery): return self.clause_with_joiner('or') def match(self, item): - return any([q.match(item) for q in self.subqueries]) + return any(q.match(item) for q in self.subqueries) class NotQuery(Query): diff --git a/docs/changelog.rst b/docs/changelog.rst index 552cdc31f..998125ad9 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -73,6 +73,9 @@ Bug fixes: * :doc:`/dev/library`: Use slow queries for flexible attributes in aunique. :bug:`2678` :bug:`3553` +* :doc:`/reference/query`: Use short-circuit evaluation in AndQuery and OrQuery + :bug:`4145` + 1.5.0 (August 19, 2021) -----------------------