Merge pull request #5579 from brendene/v1.5.x

tacaswell · tacaswell · commit 0cf4085cfc9d · 2015-12-13T22:53:40.000-05:00
Fix #5543: Handle timezone in num2date
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -281,7 +281,7 @@ def _from_ordinalf(x, tz=None):
     elif dt.microsecond > 999990:
         dt += datetime.timedelta(microseconds=1e6 - dt.microsecond)
 
-    return dt
+    return dt.astimezone(tz)
 
 
 # a version of _from_ordinalf that can operate on numpy arrays
