diff options
| author | Vytis Banaitis <vytis.banaitis@gmail.com> | 2017-01-20 23:04:05 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-01-26 08:19:27 -0500 |
| commit | d1bab24e0144d14513a1411503c95ececb425188 (patch) | |
| tree | 187452bf7b66a9600abc47570ccae22e6d539ede /django/utils/dateformat.py | |
| parent | 888c1e9bfe49135d049cbdcbbb0f2e97a1a0a1f5 (diff) | |
Refs #23919, #27778 -- Removed obsolete mentions of unicode.
Diffstat (limited to 'django/utils/dateformat.py')
| -rw-r--r-- | django/utils/dateformat.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py index 67968e5d73..74c4b894d3 100644 --- a/django/utils/dateformat.py +++ b/django/utils/dateformat.py @@ -85,9 +85,7 @@ class TimeFormat(Formatter): try: if hasattr(self.data, 'tzinfo') and self.data.tzinfo: - # Have to use tzinfo.tzname and not datetime.tzname - # because datatime.tzname does not expect Unicode - return self.data.tzinfo.tzname(self.data) or "" + return self.data.tzname() or '' except NotImplementedError: pass return "" |