Replaced set |= operator with update() to avoid temporary set.
This commit is contained in:
parent
59f8118c86
commit
7be94e0335
|
@ -204,7 +204,7 @@ class ModelBase(type):
|
||||||
if base not in parents or not hasattr(base, '_meta'):
|
if base not in parents or not hasattr(base, '_meta'):
|
||||||
# Things without _meta aren't functional models, so they're
|
# Things without _meta aren't functional models, so they're
|
||||||
# uninteresting parents.
|
# uninteresting parents.
|
||||||
inherited_attributes |= set(base.__dict__.keys())
|
inherited_attributes.update(base.__dict__)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
parent_fields = base._meta.local_fields + base._meta.local_many_to_many
|
parent_fields = base._meta.local_fields + base._meta.local_many_to_many
|
||||||
|
|
|
@ -1017,7 +1017,7 @@ class Query:
|
||||||
)
|
)
|
||||||
# The used_joins for a tuple of expressions is the union of
|
# The used_joins for a tuple of expressions is the union of
|
||||||
# the used_joins for the individual expressions.
|
# the used_joins for the individual expressions.
|
||||||
used_joins |= set(k for k, v in self.alias_refcount.items() if v > pre_joins.get(k, 0))
|
used_joins.update(k for k, v in self.alias_refcount.items() if v > pre_joins.get(k, 0))
|
||||||
# For Oracle '' is equivalent to null. The check needs to be done
|
# For Oracle '' is equivalent to null. The check needs to be done
|
||||||
# at this stage because join promotion can't be done at compiler
|
# at this stage because join promotion can't be done at compiler
|
||||||
# stage. Using DEFAULT_DB_ALIAS isn't nice, but it is the best we
|
# stage. Using DEFAULT_DB_ALIAS isn't nice, but it is the best we
|
||||||
|
|
|
@ -7,6 +7,7 @@ import warnings
|
||||||
from contextlib import contextmanager
|
from contextlib import contextmanager
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from io import StringIO
|
from io import StringIO
|
||||||
|
from itertools import chain
|
||||||
from types import SimpleNamespace
|
from types import SimpleNamespace
|
||||||
from unittest import TestCase, skipIf, skipUnless
|
from unittest import TestCase, skipIf, skipUnless
|
||||||
from xml.dom.minidom import Node, parseString
|
from xml.dom.minidom import Node, parseString
|
||||||
|
@ -85,11 +86,7 @@ class ContextList(list):
|
||||||
"""
|
"""
|
||||||
Flattened keys of subcontexts.
|
Flattened keys of subcontexts.
|
||||||
"""
|
"""
|
||||||
keys = set()
|
return set(chain.from_iterable(d for subcontext in self for d in subcontext))
|
||||||
for subcontext in self:
|
|
||||||
for dict in subcontext:
|
|
||||||
keys |= set(dict.keys())
|
|
||||||
return keys
|
|
||||||
|
|
||||||
|
|
||||||
def instrumented_test_render(self, context):
|
def instrumented_test_render(self, context):
|
||||||
|
|
Loading…
Reference in New Issue