Use new assert helper functions from curtsies

sebastinas · sebastinas · commit 80d7d9407259 · 2021-01-24T16:33:37.000+01:00
diff --git a/README.rst b/README.rst
@@ -155,7 +155,7 @@ your config file as **~/.config/bpython/config** (i.e.
 Dependencies
 ============
 * Pygments
-* curtsies >= 0.3.3
+* curtsies >= 0.3.5
 * greenlet
 * pyxdg
 * requests
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -4,7 +4,11 @@
 import sys
 
 from contextlib import contextmanager
-from curtsies.formatstringarray import FormatStringTest, fsarray
+from curtsies.formatstringarray import (
+    fsarray,
+    assertFSArraysEqual,
+    assertFSArraysEqualIgnoringFormatting,
+)
 from curtsies.fmtfuncs import cyan, bold, green, yellow, on_magenta, red
 from unittest import mock
 
@@ -41,7 +45,7 @@ def tearDownClass(cls):
         TestCase.tearDownClass()
 
 
-class CurtsiesPaintingTest(FormatStringTest, ClearEnviron):
+class CurtsiesPaintingTest(ClearEnviron):
     def setUp(self):
         class TestRepl(BaseRepl):
             def _request_refresh(inner_self):
@@ -56,14 +60,14 @@ def locals(self):
 
     def assert_paint(self, screen, cursor_row_col):
         array, cursor_pos = self.repl.paint()
-        self.assertFSArraysEqual(array, screen)
+        assertFSArraysEqual(array, screen)
         self.assertEqual(cursor_pos, cursor_row_col)
 
     def assert_paint_ignoring_formatting(
         self, screen, cursor_row_col=None, **paint_kwargs
     ):
         array, cursor_pos = self.repl.paint(**paint_kwargs)
-        self.assertFSArraysEqualIgnoringFormatting(array, screen)
+        assertFSArraysEqualIgnoringFormatting(array, screen)
         if cursor_row_col is not None:
             self.assertEqual(cursor_pos, cursor_row_col)
 
@@ -156,7 +160,7 @@ def foo(x, y, z=10):
             + bold(cyan("10"))
             + yellow(")")
         ]
-        self.assertFSArraysEqual(fsarray(array), fsarray(screen))
+        assertFSArraysEqual(fsarray(array), fsarray(screen))
 
     def test_formatted_docstring(self):
         actual = replpainter.formatted_docstring(
@@ -165,7 +169,7 @@ def test_formatted_docstring(self):
             config=setup_config(),
         )
         expected = fsarray(["Returns the results", "", "Also has side effects"])
-        self.assertFSArraysEqualIgnoringFormatting(actual, expected)
+        assertFSArraysEqualIgnoringFormatting(actual, expected)
 
     def test_unicode_docstrings(self):
         "A bit of a special case in Python 2"
@@ -178,7 +182,7 @@ def foo():
             foo.__doc__, 40, config=setup_config()
         )
         expected = fsarray(["åß∂ƒ"])
-        self.assertFSArraysEqualIgnoringFormatting(actual, expected)
+        assertFSArraysEqualIgnoringFormatting(actual, expected)
 
     def test_nonsense_docstrings(self):
         for docstring in [
@@ -208,7 +212,7 @@ def foo():
         wd = pydoc.getdoc(foo)
         actual = replpainter.formatted_docstring(wd, 40, config=setup_config())
         expected = fsarray(["asdfåß∂ƒ"])
-        self.assertFSArraysEqualIgnoringFormatting(actual, expected)
+        assertFSArraysEqualIgnoringFormatting(actual, expected)
 
     def test_paint_lasts_events(self):
         actual = replpainter.paint_last_events(
@@ -219,7 +223,7 @@ def test_paint_lasts_events(self):
         else:
             expected = fsarray(["+-+", "|c|", "|b|", "+-+"])
 
-        self.assertFSArraysEqualIgnoringFormatting(actual, expected)
+        assertFSArraysEqualIgnoringFormatting(actual, expected)
 
 
 @contextmanager
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 Pygments
-curtsies >=0.3.3
+curtsies >=0.3.5
 cwcwidth
 greenlet
 pyxdg
diff --git a/setup.py b/setup.py
@@ -177,7 +177,7 @@ def git_describe_to_python_version(version):
 install_requires = [
     "pygments",
     "requests",
-    "curtsies >=0.3.3",
+    "curtsies >=0.3.5",
     "greenlet",
     "cwcwidth",
     "pyxdg",
