@cached_property
def supports_area_geodetic(self):
- return bool(self.connection.ops.lwgeom_version())
+ return self.connection.ops.lwgeom_version()
diff --git a/django/db/models/sql/compiler.py
b/django/db/models/sql/compiler.py
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -51,7 +51,7 @@ class SQLCompiler:
order_by = self.get_order_by()
self.where, self.having = self.query.where.split_having()
extra_select = self.get_extra_select(order_by, self.select)
- self.has_extra_select = bool(extra_select)
+ self.has_extra_select = extra_select
group_by = self.get_group_by(self.select + extra_select,
order_by)
return extra_select, order_by, group_by
@@ -1216,11 +1216,10 @@ class SQLInsertCompiler(SQLCompiler):
insert_statement =
self.connection.ops.insert_statement(on_conflict=self.query.on_conflict)
result = ['%s %s' % (insert_statement, qn(opts.db_table))]
- has_fields = bool(self.query.fields)
- fields = self.query.fields if has_fields else [opts.pk]
+ fields = self.query.fields or [opts.pk]
result.append('(%s)' % ', '.join(qn(f.column) for f in fields))
- if has_fields:
+ if self.query.fields:
value_rows = [
[self.prepare_value(field, self.pre_save_val(field, obj))
for field in fields]
for obj in self.query.objs
}}}
--
Ticket URL: <https://code.djangoproject.com/ticket/28906>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.
* Attachment "less_bool.patch" added.
Comment (by Jon Dufresne):
>{{{
> @cached_property
> def supports_area_geodetic(self):
>- return bool(self.connection.ops.lwgeom_version())
>+ return self.connection.ops.lwgeom_version()
> }}}
>{{{
>- self.has_extra_select = bool(extra_select)
>+ self.has_extra_select = extra_select
>}}}
For methods and members, I think the type might be considered part of the
interface and should perhaps stay.
Reducing `bool()` in expressions seems OK to me though.
--
Ticket URL: <https://code.djangoproject.com/ticket/28906#comment:1>
* component: Uncategorized => Core (Other)
* stage: Unreviewed => Ready for checkin
Comment:
[https://github.com/django/django/pull/9446 PR]. I updated the patch as
per Jon's comments which I also agree with.
--
Ticket URL: <https://code.djangoproject.com/ticket/28906#comment:2>
* status: new => closed
* resolution: => fixed
Comment:
In [changeset:"2b81faab257832d3dbd42947a884f7ec99685d18" 2b81faa]:
{{{
#!CommitTicketReference repository=""
revision="2b81faab257832d3dbd42947a884f7ec99685d18"
Fixed #28906 -- Removed unnecessary bool() calls.
}}}
--
Ticket URL: <https://code.djangoproject.com/ticket/28906#comment:3>