From 94463aa861208b11382c7904272d3529372d6b24 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Wed, 24 Mar 2021 11:44:01 +0100 Subject: [PATCH] Removed trailing whitespaces in error messages. --- django/conf/__init__.py | 2 +- django/db/models/functions/datetime.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django/conf/__init__.py b/django/conf/__init__.py index d6266521a9..00b2ab82d0 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -153,7 +153,7 @@ class Settings: if (setting in tuple_settings and not isinstance(setting_value, (list, tuple))): - raise ImproperlyConfigured("The %s setting must be a list or a tuple. " % setting) + raise ImproperlyConfigured("The %s setting must be a list or a tuple." % setting) setattr(self, setting, setting_value) self._explicit_settings.add(setting) diff --git a/django/db/models/functions/datetime.py b/django/db/models/functions/datetime.py index 90e6f41be0..ce249b2854 100644 --- a/django/db/models/functions/datetime.py +++ b/django/db/models/functions/datetime.py @@ -73,7 +73,7 @@ class Extract(TimezoneMixin, Transform): # Passing dates to functions expecting datetimes is most likely a mistake. if type(field) == DateField and copy.lookup_name in ('hour', 'minute', 'second'): raise ValueError( - "Cannot extract time component '%s' from DateField '%s'. " % (copy.lookup_name, field.name) + "Cannot extract time component '%s' from DateField '%s'." % (copy.lookup_name, field.name) ) if ( isinstance(field, DurationField) and @@ -226,13 +226,13 @@ class TruncBase(TimezoneMixin, Transform): has_explicit_output_field = class_output_field or field.__class__ is not copy.output_field.__class__ if type(field) == DateField and ( isinstance(output_field, DateTimeField) or copy.kind in ('hour', 'minute', 'second', 'time')): - raise ValueError("Cannot truncate DateField '%s' to %s. " % ( + raise ValueError("Cannot truncate DateField '%s' to %s." % ( field.name, output_field.__class__.__name__ if has_explicit_output_field else 'DateTimeField' )) elif isinstance(field, TimeField) and ( isinstance(output_field, DateTimeField) or copy.kind in ('year', 'quarter', 'month', 'week', 'day', 'date')): - raise ValueError("Cannot truncate TimeField '%s' to %s. " % ( + raise ValueError("Cannot truncate TimeField '%s' to %s." % ( field.name, output_field.__class__.__name__ if has_explicit_output_field else 'DateTimeField' )) return copy