summaryrefslogtreecommitdiff
path: root/django/utils/dateformat.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils/dateformat.py')
-rw-r--r--django/utils/dateformat.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index b2586ba1ff..6d0a7b63f7 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -234,7 +234,7 @@ class DateFormat(TimeFormat):
def T(self):
"Time zone of this machine; e.g. 'EST' or 'MDT'"
- name = self.timezone and self.timezone.tzname(self.data) or None
+ name = self.timezone.tzname(self.data) if self.timezone else None
if name is None:
name = self.format('O')
return six.text_type(name)