py2.7 unicode bug, pytest 3.4 on travis and appveyor

story645 · story645 · commit 8d7746646103 · 2018-02-08T01:44:41.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.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
+  - pip install -q "pytest>=3.4.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.3.0
+    - PYTEST="pytest>=3.4.0"
     - PYTEST_COV=pytest-cov
     - PYTEST_PEP8=
     - SPHINX=sphinx
diff --git a/lib/matplotlib/category.py b/lib/matplotlib/category.py
@@ -5,7 +5,7 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-from collections import Iterable, OrderedDict
+from collections import OrderedDict
 import itertools
 
 import six
@@ -46,7 +46,7 @@ def convert(value, unit, axis):
         value: string, iterable
             value or list of values to plot
         unit:
-        axis:
+        axis: matplotlib axis object on which the value is plotted
         """
         # dtype = object preserves numerical pass throughs
         values = np.atleast_1d(np.array(value, dtype=object))
@@ -149,13 +149,9 @@ def update(self, data):
         TypeError
               If the value in data is not a string, unicode, bytes type
         """
+        data = np.atleast_1d(np.array(data, dtype=object))
 
-        if (isinstance(data, VALID_TYPES) or
-                not isinstance(data, Iterable)):
-            data = [data]
-
-        unsorted_unique = OrderedDict.fromkeys(data)
-        for val in unsorted_unique:
+        for val in OrderedDict.fromkeys(data):
             if not isinstance(val, VALID_TYPES):
                 raise TypeError("{val!r} is not a string".format(val=val))
             if val not in self._mapping:
diff --git a/lib/matplotlib/tests/test_category.py b/lib/matplotlib/tests/test_category.py
@@ -121,13 +121,15 @@ def test_axisinfo(self):
     def test_default_units(self):
         assert isinstance(self.cc.default_units(["a"], self.ax), cat.UnitData)
 
+
 @pytest.fixture
 def ax():
     return plt.figure().subplots()
 
 PLOT_LIST = [Axes.scatter, Axes.plot, Axes.bar]
 PLOT_IDS = ["scatter", "plot", "bar"]
 
+
 class TestStrCategoryLocator(object):
     def test_StrCategoryLocator(self):
         locs = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
@@ -152,14 +154,14 @@ def test_StrCategoryFormatter(self, ax, ydata):
         unit = cat.UnitData(ydata)
         labels = cat.StrCategoryFormatter(unit)
         for i, d in enumerate(ydata):
-            assert labels(i, i) == d
+            assert labels(i, i) == cat.to_str(d)
 
     @pytest.mark.parametrize("ydata", cases, ids=ids)
     @pytest.mark.parametrize("plotter", PLOT_LIST, ids=PLOT_IDS)
     def test_StrCategoryFormatterPlot(self, ax, ydata, plotter):
         plotter(ax, range(len(ydata)), ydata)
         for i, d in enumerate(ydata):
-            assert ax.yaxis.major.formatter(i, i) == d
+            assert ax.yaxis.major.formatter(i, i) == cat.to_str(d)
         assert ax.yaxis.major.formatter(i+1, i+1) == ""
         assert ax.yaxis.major.formatter(0, None) == ""
 
