Merge pull request #7705 from Kojoley/issue-7630

tacaswell · tacaswell · commit c602d8269de8 · 2016-12-29T17:23:02.000-05:00
FIX: Fixes tzname return type
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -159,7 +159,7 @@ def utcoffset(self, dt):
         return datetime.timedelta(0)
 
     def tzname(self, dt):
-        return "UTC"
+        return str("UTC")
 
     def dst(self, dt):
         return datetime.timedelta(0)
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -465,6 +465,11 @@ def test_DayLocator():
    mdates.DayLocator(interval=1.0)
 
 
+def test_tz_utc():
+    dt = datetime.datetime(1970, 1, 1, tzinfo=mdates.UTC)
+    dt.tzname()
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
