summaryrefslogtreecommitdiff
path: root/django/utils/dateformat.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-05-17 16:33:36 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-05-17 18:08:58 +0200
commit9c487b5974ee7e7f196079611d7352364e8873ed (patch)
treeefc6ffa38da07b4302e145c33047cf2c41da105a /django/utils/dateformat.py
parentb1bfd9630ef049070b0cd6ae215470d3d1facd40 (diff)
Replaced an antiquated pattern.
Thanks Lennart Regebro for pointing it out.
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)