summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2013-08-29 19:20:00 -0400
committerSimon Charette <charette.s@gmail.com>2013-08-30 10:57:51 -0400
commit11cd7388f77aa9d12ab6b57285c3801b237e241b (patch)
treee4853e5c87e1de082660e10b2144b91b4d9b7d0c /django/db/models/sql
parente4a67fd90626ced92a61f38ef682d2aa4f34a3ff (diff)
Fixed #20989 -- Removed useless explicit list comprehensions.
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/aggregates.py2
-rw-r--r--django/db/models/sql/compiler.py8
-rw-r--r--django/db/models/sql/query.py14
3 files changed, 12 insertions, 12 deletions
diff --git a/django/db/models/sql/aggregates.py b/django/db/models/sql/aggregates.py
index 9fc5fe8a5b..3cda4d244e 100644
--- a/django/db/models/sql/aggregates.py
+++ b/django/db/models/sql/aggregates.py
@@ -77,7 +77,7 @@ class Aggregate(object):
if hasattr(self.col, 'as_sql'):
field_name, params = self.col.as_sql(qn, connection)
elif isinstance(self.col, (list, tuple)):
- field_name = '.'.join([qn(c) for c in self.col])
+ field_name = '.'.join(qn(c) for c in self.col)
else:
field_name = self.col
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 5dda379236..1c6e80b538 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -718,11 +718,11 @@ class SQLCompiler(object):
loaded_fields = self.query.get_loaded_field_names().get(self.query.model, set()) or self.query.select
aggregate_start = len(self.query.extra_select) + len(loaded_fields)
aggregate_end = aggregate_start + len(self.query.aggregate_select)
- row = tuple(row[:aggregate_start]) + tuple([
+ row = tuple(row[:aggregate_start]) + tuple(
self.query.resolve_aggregate(value, aggregate, self.connection)
for (alias, aggregate), value
in zip(self.query.aggregate_select.items(), row[aggregate_start:aggregate_end])
- ]) + tuple(row[aggregate_end:])
+ ) + tuple(row[aggregate_end:])
yield row
@@ -827,7 +827,7 @@ class SQLInsertCompiler(SQLCompiler):
has_fields = bool(self.query.fields)
fields = self.query.fields if has_fields else [opts.pk]
- result.append('(%s)' % ', '.join([qn(f.column) for f in fields]))
+ result.append('(%s)' % ', '.join(qn(f.column) for f in fields))
if has_fields:
params = values = [
@@ -1007,7 +1007,7 @@ class SQLUpdateCompiler(SQLCompiler):
# selecting from the updating table (e.g. MySQL).
idents = []
for rows in query.get_compiler(self.using).execute_sql(MULTI):
- idents.extend([r[0] for r in rows])
+ idents.extend(r[0] for r in rows)
self.query.add_filter(('pk__in', idents))
self.query.related_ids = idents
else:
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 75d357ea15..93a0b52330 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -371,11 +371,11 @@ class Query(object):
if result is None:
result = [None for q in query.aggregate_select.items()]
- return dict([
+ return dict(
(alias, self.resolve_aggregate(val, aggregate, connection=connections[using]))
for (alias, aggregate), val
in zip(query.aggregate_select.items(), result)
- ])
+ )
def get_count(self, using):
"""
@@ -1755,7 +1755,7 @@ class Query(object):
"""
Callback used by get_deferred_field_names().
"""
- target[model] = set([f.name for f in fields])
+ target[model] = set(f.name for f in fields)
def set_aggregate_mask(self, names):
"Set the mask of aggregates that will actually be returned by the SELECT"
@@ -1790,10 +1790,10 @@ class Query(object):
if self._aggregate_select_cache is not None:
return self._aggregate_select_cache
elif self.aggregate_select_mask is not None:
- self._aggregate_select_cache = OrderedDict([
+ self._aggregate_select_cache = OrderedDict(
(k, v) for k, v in self.aggregates.items()
if k in self.aggregate_select_mask
- ])
+ )
return self._aggregate_select_cache
else:
return self.aggregates
@@ -1803,10 +1803,10 @@ class Query(object):
if self._extra_select_cache is not None:
return self._extra_select_cache
elif self.extra_select_mask is not None:
- self._extra_select_cache = OrderedDict([
+ self._extra_select_cache = OrderedDict(
(k, v) for k, v in self.extra.items()
if k in self.extra_select_mask
- ])
+ )
return self._extra_select_cache
else:
return self.extra