_axes.py pep8 bug 'cause of merging

story645 · story645 · commit 2977068c816e · 2018-02-08T02:19:15.000-05:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6442,7 +6442,7 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
         if normed is not None:
             warnings.warn("The 'normed' kwarg is deprecated, and has been "
                           "replaced by the 'density' kwarg.")
-            
+
         # basic input validation
         input_empty = np.size(x) == 0
         # Massage 'x' for processing.
diff --git a/lib/matplotlib/tests/test_category.py b/lib/matplotlib/tests/test_category.py
@@ -256,6 +256,7 @@ def test_update_plot(self, ax, plotter):
     PLOT_BROKEN_LIST = [Axes.scatter,
                         pytest.param(Axes.plot, marks=pytest.mark.xfail),
                         pytest.param(Axes.bar, marks=pytest.mark.xfail)]
+
     PLOT_BROKEN_IDS = ["scatter", "plot", "bar"]
 
     @pytest.mark.parametrize("plotter", PLOT_BROKEN_LIST, ids=PLOT_BROKEN_IDS)
