Backport PR #12678: FIX: properly set tz for YearLocator

jklymak · jklymak · commit 7ae4a3600ee2 · 2019-01-28T12:48:21.000-08:00
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -475,57 +475,6 @@ def _create_auto_date_locator(date1, date2):
         assert list(map(str, mdates.num2date(locator()))) == expected
 
 
-def test_concise_formatter():
-    def _create_auto_date_locator(date1, date2):
-        fig, ax = plt.subplots()
-
-        locator = mdates.AutoDateLocator(interval_multiples=True)
-        formatter = mdates.ConciseDateFormatter(locator)
-        ax.yaxis.set_major_locator(locator)
-        ax.yaxis.set_major_formatter(formatter)
-        ax.set_ylim(date1, date2)
-        fig.canvas.draw()
-        sts = []
-        for st in ax.get_yticklabels():
-            sts += [st.get_text()]
-        return sts
-
-    d1 = datetime.datetime(1997, 1, 1)
-    results = ([datetime.timedelta(weeks=52 * 200),
-                [str(t) for t in range(1980, 2201, 20)]
-                ],
-               [datetime.timedelta(weeks=52),
-                ['1997', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
-                'Sep', 'Oct', 'Nov', 'Dec']
-                ],
-               [datetime.timedelta(days=141),
-                ['Jan', '22', 'Feb', '22', 'Mar', '22', 'Apr', '22',
-                 'May', '22']
-                ],
-               [datetime.timedelta(days=40),
-                ['Jan', '05', '09', '13', '17', '21', '25', '29', 'Feb',
-                 '05', '09']
-                ],
-               [datetime.timedelta(hours=40),
-                ['Jan-01', '04:00', '08:00', '12:00', '16:00', '20:00',
-                 'Jan-02', '04:00', '08:00', '12:00', '16:00']
-                ],
-               [datetime.timedelta(minutes=20),
-                ['00:00', '00:05', '00:10', '00:15', '00:20']
-                ],
-               [datetime.timedelta(seconds=40),
-                ['00:00', '05', '10', '15', '20', '25', '30', '35', '40']
-                ],
-               [datetime.timedelta(seconds=2),
-                ['59.5', '00:00', '00.5', '01.0', '01.5', '02.0', '02.5']
-                ],
-               )
-    for t_delta, expected in results:
-        d2 = d1 + t_delta
-        strings = _create_auto_date_locator(d1, d2)
-        assert strings == expected
-
-
 def test_auto_date_locator_intmult_tz():
     def _create_auto_date_locator(date1, date2, tz):
         locator = mdates.AutoDateLocator(interval_multiples=True, tz=tz)
