draw

Author: TomAugspurger

pandas/tests/plotting/test_datetimelike.py

@@ -374,7 +374,6 @@ def test_axis_limits(self):
         def _test(ax):
             xlim = ax.get_xlim()
             ax.set_xlim(xlim[0] - 5, xlim[1] + 10)
-            ax.get_figure().canvas.draw()
             result = ax.get_xlim()
             assert result[0] == xlim[0] - 5
             assert result[1] == xlim[1] + 10
@@ -383,7 +382,6 @@ def _test(ax):
             expected = (Period('1/1/2000', ax.freq),
                         Period('4/1/2000', ax.freq))
             ax.set_xlim('1/1/2000', '4/1/2000')
-            ax.get_figure().canvas.draw()
             result = ax.get_xlim()
             assert int(result[0]) == expected[0].ordinal
             assert int(result[1]) == expected[1].ordinal
@@ -392,7 +390,6 @@ def _test(ax):
             expected = (Period('1/1/2000', ax.freq),
                         Period('4/1/2000', ax.freq))
             ax.set_xlim(datetime(2000, 1, 1), datetime(2000, 4, 1))
-            ax.get_figure().canvas.draw()
             result = ax.get_xlim()
             assert int(result[0]) == expected[0].ordinal
             assert int(result[1]) == expected[1].ordinal
@@ -429,12 +426,7 @@ def test_get_finder(self):
     def test_finder_daily(self):
         day_lst = [10, 40, 252, 400, 950, 2750, 10000]
 
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_2_3:
-            xpl1 = xpl2 = [Period('1999-1-1', freq='B').ordinal] * len(day_lst)
-        else:  # 2.2.3, 2.2.4
-            xpl1 = [7565, 7564, 7553, 7546, 7518, 7428, 7066]
-            xpl2 = [7566, 7564, 7554, 7546, 7519, 7429, 7066]
-
+        xpl1 = xpl2 = [Period('1999-1-1', freq='B').ordinal] * len(day_lst)
         rs1 = []
         rs2 = []
         for i, n in enumerate(day_lst):
@@ -457,12 +449,7 @@ def test_finder_daily(self):
     def test_finder_quarterly(self):
         yrs = [3.5, 11]
 
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_2_3:
-            xpl1 = xpl2 = [Period('1988Q1').ordinal] * len(yrs)
-        else:  # 2.2.3, 2.2.4
-            xpl1 = [68, 68]
-            xpl2 = [72, 68]
-
+        xpl1 = xpl2 = [Period('1988Q1').ordinal] * len(yrs)
         rs1 = []
         rs2 = []
         for i, n in enumerate(yrs):
@@ -485,12 +472,7 @@ def test_finder_quarterly(self):
     def test_finder_monthly(self):
         yrs = [1.15, 2.5, 4, 11]
 
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_2_3:
-            xpl1 = xpl2 = [Period('Jan 1988').ordinal] * len(yrs)
-        else:  # 2.2.3, 2.2.4
-            xpl1 = [216, 216, 204, 204]
-            xpl2 = [216, 216, 216, 204]
-
+        xpl1 = xpl2 = [Period('Jan 1988').ordinal] * len(yrs)
         rs1 = []
         rs2 = []
         for i, n in enumerate(yrs):
@@ -521,11 +503,7 @@ def test_finder_monthly_long(self):
 
     @pytest.mark.slow
     def test_finder_annual(self):
-        if self.mpl_ge_3_0_0 or not self.mpl_ge_2_2_3:
-            xp = [1987, 1988, 1990, 1990, 1995, 2020, 2070, 2170]
-        else:  # 2.2.3, 2.2.4
-            xp = [1986, 1986, 1990, 1990, 1995, 2020, 1970, 1970]
-
+        xp = [1987, 1988, 1990, 1990, 1995, 2020, 2070, 2170]
         xp = [Period(x, freq='A').ordinal for x in xp]
         rs = []
         for i, nyears in enumerate([5, 10, 19, 49, 99, 199, 599, 1001]):
@@ -1093,7 +1071,6 @@ def test_time(self):
         df.plot(ax=ax)
 
         # verify tick labels
-        fig.canvas.draw()
         ticks = ax.get_xticks()
         labels = ax.get_xticklabels()
         for t, l in zip(ticks, labels):
@@ -1120,7 +1097,6 @@ def test_time_change_xlim(self):
         df.plot(ax=ax)
 
         # verify tick labels
-        fig.canvas.draw()
         ticks = ax.get_xticks()
         labels = ax.get_xticklabels()
         for t, l in zip(ticks, labels):
@@ -1138,7 +1114,6 @@ def test_time_change_xlim(self):
         ax.set_xlim('1:30', '5:00')
 
         # check tick labels again
-        fig.canvas.draw()
         ticks = ax.get_xticks()
         labels = ax.get_xticklabels()
         for t, l in zip(ticks, labels):
@@ -1165,7 +1140,6 @@ def test_time_musec(self):
         ax = df.plot(ax=ax)
 
         # verify tick labels
-        fig.canvas.draw()
         ticks = ax.get_xticks()
         labels = ax.get_xticklabels()
         for t, l in zip(ticks, labels):
@@ -1432,7 +1406,7 @@ def test_format_timedelta_ticks_narrow(self):
         df = DataFrame(np.random.randn(len(rng), 3), rng)
         fig, ax = self.plt.subplots()
         df.plot(fontsize=2, ax=ax)
-        fig.canvas.draw()
+        self.plt.draw()
         labels = ax.get_xticklabels()
 
         result_labels = [x.get_text() for x in labels]
@@ -1456,7 +1430,7 @@ def test_format_timedelta_ticks_wide(self):
         df = DataFrame(np.random.randn(len(rng), 3), rng)
         fig, ax = self.plt.subplots()
         ax = df.plot(fontsize=2, ax=ax)
-        fig.canvas.draw()
+        self.plt.draw()
         labels = ax.get_xticklabels()
 
         result_labels = [x.get_text() for x in labels]
@@ -1529,7 +1503,7 @@ def test_matplotlib_scatter_datetime64(self):
         df["time"] = date_range("2018-01-01", periods=10, freq="D")
         fig, ax = self.plt.subplots()
         ax.scatter(x="time", y="y", data=df)
-        fig.canvas.draw()
+        self.plt.draw()
         label = ax.get_xticklabels()[0]
         if self.mpl_ge_3_0_0:
             expected = "2017-12-08"