fix test for python 3.5

Author: samuelcolvin

tests/test_main.py

@@ -173,16 +173,15 @@ def test_warnings_disabled():
     assert len(warnings) == 0
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason='kwarg order is not guaranteed for 3.5')
 def test_eval_kwargs():
     with pytest.warns(RuntimeWarning):
         v = eval('debug.format(1, apple="pear")')
 
-    assert str(v) == (
-        "<string>:1 <module>\n"
-        "    1 (int)\n"
-        "    apple: 'pear' (str) len=4"
-    )
+    assert set(str(v).split('\n')) == {
+        "<string>:1 <module>",
+        "    1 (int)",
+        "    apple: 'pear' (str) len=4",
+    }
 
 
 def test_exec(capsys):

tests/test_prettier.py

@@ -1,6 +1,5 @@
 import string
-from collections import OrderedDict
-from typing import Any, NamedTuple
+from collections import OrderedDict, namedtuple
 
 import numpy
 
@@ -84,12 +83,9 @@ def test_generator():
 
 
 def test_named_tuple():
-    class TestNT(NamedTuple):
-        foo: str
-        bar: str
-        spam: int
-    v = pformat(TestNT('x', 'y', 1))
-    assert v == ("TestNT(\n"
+    f = namedtuple('Foobar', ['foo', 'bar', 'spam'])
+    v = pformat(f('x', 'y', 1))
+    assert v == ("Foobar(\n"
                  "    foo='x',\n"
                  "    bar='y',\n"
                  "    spam=1,\n"
@@ -175,23 +171,20 @@ def test_frozenset():
 
 
 def test_deep_objects():
-    class TestNT(NamedTuple):
-        foo: str
-        bar: str
-        spam: Any
+    f = namedtuple('Foobar', ['foo', 'bar', 'spam'])
     v = pformat((
-        {
-            'a': TestNT('x', 'y', OrderedDict([(1, 2), (3, 4), (5, 6)])),
-            'b': frozenset(range(3)),
-            'c': [1, 2, {1: 2, 3: 4}]
-        },
+        (
+            f('x', 'y', OrderedDict([(1, 2), (3, 4), (5, 6)])),
+            frozenset(range(3)),
+            [1, 2, {1: 2}]
+        ),
         {1, 2, 3}
     ))
     print(v)
     assert v == """\
 (
-    {
-        'a': TestNT(
+    (
+        Foobar(
             foo='x',
             bar='y',
             spam=OrderedDict([
@@ -200,19 +193,16 @@ class TestNT(NamedTuple):
                 (5, 6),
             ]),
         ),
-        'b': frozenset({
+        frozenset({
             0,
             1,
             2,
         }),
-        'c': [
+        [
             1,
             2,
-            {
-                1: 2,
-                3: 4,
-            },
+            {1: 2},
         ],
-    },
+    ),
     {1, 2, 3},
 )"""