refactoring, unicode, pytest >=3.1 & !=3.0

story645 · story645 · commit c07b9a3bc75c · 2018-02-08T11:42:37.000-05:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -66,7 +66,7 @@ install:
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
-  - pip install -q "pytest>=3.4.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
+  - pip install -q "pytest>=3.1.0&pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
 
   # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
   # https://github.com/matplotlib/matplotlib/issues/9176
diff --git a/.travis.yml b/.travis.yml
@@ -52,7 +52,7 @@ env:
     - NUMPY=numpy
     - PANDAS=
     - PYPARSING=pyparsing
-    - PYTEST="pytest>=3.4.0"
+    - PYTEST="pytest>=3.1.0&pytest!=3.3.0"
     - PYTEST_COV=pytest-cov
     - PYTEST_PEP8=
     - SPHINX=sphinx
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/category.py b/lib/matplotlib/category.py
@@ -10,6 +10,7 @@
 
 import six
 
+
 import numpy as np
 
 import matplotlib.units as units
@@ -130,11 +131,10 @@ def __init__(self, data=None):
         data: iterable
               sequence of string values
         """
-        if data is None:
-            data = ()
         self._mapping = OrderedDict()
         self._counter = itertools.count(start=0)
-        self.update(data)
+        if data is not None:
+            self.update(data)
 
     def update(self, data):
         """Maps new values to integer identifiers.
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)
