Better error message regex

Author: h-vetinari

pandas/tests/test_algos.py

@@ -11,8 +11,9 @@
 
 from pandas._libs import (
     algos as libalgos, groupby as libgroupby, hashtable as ht)
-from pandas.compat import PY2, lrange, range
-from pandas.compat.numpy import np_array_datetime64_compat
+from pandas.compat import lrange, range
+from pandas.compat.numpy import (
+    _np_version_under1p14, np_array_datetime64_compat)
 import pandas.util._test_decorators as td
 
 from pandas.core.dtypes.dtypes import CategoricalDtype as CDT
@@ -224,14 +225,15 @@ def test_factorize_tuple_list(self, data, expected_label, expected_level):
                                                      dtype=object)
         tm.assert_numpy_array_equal(result[1], expected_level_array)
 
-    @pytest.mark.skipif(PY2, reason="pytest.raises match regex fails")
     def test_complex_sorting(self):
         # gh 12666 - check no segfault
         x17 = np.array([complex(i) for i in range(17)], dtype=object)
 
-        msg = (r"'(<|>)' not supported between instances of 'complex' and"
-               r" 'complex'|"
-               r"unorderable types: complex\(\) (<|>) complex\(\)")
+        msg = (r"unorderable types: {0} [<>] {0}".format(r"complex\(\)")
+               if _np_version_under1p14 else
+               r"'[<>]' not supported between instances of {0} and {0}".format(
+                   "'complex'")
+               )
         with pytest.raises(TypeError, match=msg):
             algos.factorize(x17[::-1], sort=True)
 

pandas/tests/test_sorting.py

@@ -7,7 +7,7 @@
 from numpy import nan
 import pytest
 
-from pandas.compat import PY2
+from pandas.compat.numpy import _np_version_under1p14
 
 from pandas import DataFrame, MultiIndex, Series, compat, concat, merge
 from pandas.core import common as com
@@ -405,15 +405,16 @@ def test_mixed_integer_from_list(self):
         expected = np.array([0, 0, 1, 'a', 'b', 'b'], dtype=object)
         tm.assert_numpy_array_equal(result, expected)
 
-    @pytest.mark.skipif(PY2, reason="pytest.raises match regex fails")
     def test_unsortable(self):
         # GH 13714
         arr = np.array([1, 2, datetime.now(), 0, 3], dtype=object)
-        msg = (r"'(<|>)' not supported between instances of ('"
-               r"datetime\.datetime' and 'int'|'int' and 'datetime\.datetime"
-               r"')|"
-               r"unorderable types: int\(\) < datetime\.datetime\(\)|"
-               r"unorderable types: datetime\.datetime\(\) < int\(\)")
+        msg = (r"unorderable types: ({0} [<>] {1}|{1} [<>] {0})".format(
+                   r"int\(\)", r"datetime\.datetime\(\)")  # noqa: E126
+               if _np_version_under1p14 else
+               (r"'[<>]' not supported between instances of "
+                r"({0} and {1}|{1} and {0})").format(
+                    "'int'", r"'datetime\.datetime'")
+               )
         if compat.PY2:
             # RuntimeWarning: tp_compare didn't return -1 or -2 for exception
             with warnings.catch_warnings():