diff --git a/halo/halo.py b/halo/halo.py index 8ebaa86..f80e2e2 100644 --- a/halo/halo.py +++ b/halo/halo.py @@ -20,7 +20,6 @@ decode_utf_8_text, get_environment, get_terminal_columns, - is_supported, is_text_type, encode_utf_8_text, ) diff --git a/tests/test_halo.py b/tests/test_halo.py index 29918aa..4ba04be 100644 --- a/tests/test_halo.py +++ b/tests/test_halo.py @@ -16,7 +16,7 @@ from spinners.spinners import Spinners from halo import Halo -from halo._utils import get_terminal_columns, is_supported +from halo._utils import get_terminal_columns from tests._utils import strip_ansi, find_colors, encode_utf_8_text, decode_utf_8_text from termcolor import COLORS @@ -26,12 +26,8 @@ else: get_coded_text = decode_utf_8_text -if is_supported(): - frames = [get_coded_text(frame) for frame in Spinners['dots'].value['frames']] - default_spinner = Spinners['dots'].value -else: - frames = [get_coded_text(frame) for frame in Spinners['line'].value['frames']] - default_spinner = Spinners['line'].value +frames = [get_coded_text(frame) for frame in Spinners['dots'].value['frames']] +default_spinner = Spinners['dots'].value class SpecificException(Exception): @@ -127,10 +123,7 @@ def test_text_spinner_color(self): def test_spinner_getter(self): instance = Halo() - if is_supported(): - default_spinner_value = "dots" - else: - default_spinner_value = "line" + default_spinner_value = "dots" instance.spinner = default_spinner_value self.assertEqual(default_spinner, instance.spinner) @@ -368,16 +361,10 @@ def test_spinner_getters_setters(self): self.assertEqual(spinner.text_color, 'red') self.assertEqual(spinner.color, 'red') - if is_supported(): - self.assertEqual(spinner.spinner, Spinners['dots12'].value) - else: - self.assertEqual(spinner.spinner, default_spinner) + self.assertEqual(spinner.spinner, Spinners['dots12'].value) spinner.spinner = 'dots11' - if is_supported(): - self.assertEqual(spinner.spinner, Spinners['dots11'].value) - else: - self.assertEqual(spinner.spinner, default_spinner) + self.assertEqual(spinner.spinner, Spinners['dots11'].value) spinner.spinner = 'foo_bar' self.assertEqual(spinner.spinner, default_spinner) diff --git a/tests/test_halo_notebook.py b/tests/test_halo_notebook.py index b6d55a9..b8d2d21 100644 --- a/tests/test_halo_notebook.py +++ b/tests/test_halo_notebook.py @@ -10,7 +10,7 @@ from spinners.spinners import Spinners from halo import HaloNotebook -from halo._utils import get_terminal_columns, is_supported +from halo._utils import get_terminal_columns from tests._utils import decode_utf_8_text, encode_utf_8_text, find_colors, strip_ansi from termcolor import COLORS @@ -21,12 +21,8 @@ get_coded_text = decode_utf_8_text -if is_supported(): - frames = [get_coded_text(frame) for frame in Spinners['dots'].value['frames']] - default_spinner = Spinners['dots'].value -else: - frames = [get_coded_text(frame) for frame in Spinners['line'].value['frames']] - default_spinner = Spinners['line'].value +frames = [get_coded_text(frame) for frame in Spinners['dots'].value['frames']] +default_spinner = Spinners['dots'].value class TestHaloNotebook(unittest.TestCase): @@ -327,16 +323,10 @@ def test_spinner_getters_setters(self): self.assertEqual(spinner.text, 'bar') self.assertEqual(spinner.color, 'red') - if is_supported(): - self.assertEqual(spinner.spinner, Spinners['dots12'].value) - else: - self.assertEqual(spinner.spinner, default_spinner) + self.assertEqual(spinner.spinner, Spinners['dots12'].value) spinner.spinner = 'dots11' - if is_supported(): - self.assertEqual(spinner.spinner, Spinners['dots11'].value) - else: - self.assertEqual(spinner.spinner, default_spinner) + self.assertEqual(spinner.spinner, Spinners['dots11'].value) spinner.spinner = 'foo_bar' self.assertEqual(spinner.spinner, default_spinner)