Coding style.

- Increase maximum line length from 80 to 100.
This commit is contained in:
Andrew Hamilton 2021-11-29 12:51:34 +10:00
parent 75a028272d
commit 71b9da128b
15 changed files with 404 additions and 696 deletions

View file

@ -22,12 +22,9 @@ class XtermColorsTests(unittest.TestCase):
self.assertEqual(termstr.XTERM_COLORS[255], (238, 238, 238))
def test_closest_color_index(self):
self.assertEqual(termstr.closest_color_index(
(0, 0, 0), termstr.XTERM_COLORS), 0)
self.assertEqual(termstr.closest_color_index(
(255, 255, 255), termstr.XTERM_COLORS), 15)
self.assertEqual(termstr.closest_color_index(
(135, 135, 1), termstr.XTERM_COLORS), 100)
self.assertEqual(termstr.closest_color_index((0, 0, 0), termstr.XTERM_COLORS), 0)
self.assertEqual(termstr.closest_color_index((255, 255, 255), termstr.XTERM_COLORS), 15)
self.assertEqual(termstr.closest_color_index((135, 135, 1), termstr.XTERM_COLORS), 100)
class CharStyleTests(unittest.TestCase):
@ -48,12 +45,10 @@ class CharStyleTests(unittest.TestCase):
self.assertTrue(style is loaded_style)
def test_repr(self):
self.assertEqual(repr(self.style),
"<CharStyle: fg:(255, 255, 255) bg:(0, 0, 0) attr:>")
self.assertEqual(repr(self.style), "<CharStyle: fg:(255, 255, 255) bg:(0, 0, 0) attr:>")
def test_code_for_term(self):
self.assertEqual(self.style.code_for_term,
"\x1b[m\x1b[38;2;255;255;255m\x1b[48;2;0;0;0m")
self.assertEqual(self.style.code_for_term, "\x1b[m\x1b[38;2;255;255;255m\x1b[48;2;0;0;0m")
class TermStrTests(unittest.TestCase):
@ -65,8 +60,7 @@ class TermStrTests(unittest.TestCase):
foo_bold = termstr.TermStr("foo", bold_style)
self.assertEqual(repr(foo_bold), "<TermStr: 'foo'>")
self.assertEqual(foo + "bar", termstr.TermStr("foobar"))
self.assertEqual(foo + termstr.TermStr("bar"),
termstr.TermStr("foobar"))
self.assertEqual(foo + termstr.TermStr("bar"), termstr.TermStr("foobar"))
self.assertEqual("bar" + foo, termstr.TermStr("barfoo"))
self.assertFalse(foo == foo_bold)
self.assertFalse(foo_bold == foo)
@ -88,11 +82,9 @@ class TermStrTests(unittest.TestCase):
self.assertEqual(foo.find("oo"), 1)
self.assertEqual(termstr.TermStr("fo") * 2, termstr.TermStr("fofo"))
self.assertEqual(2 * termstr.TermStr("fo"), termstr.TermStr("fofo"))
self.assertEqual(foobar.split("b"), [termstr.TermStr("foo"),
termstr.TermStr("ar")])
self.assertEqual(foobar.split("b"), [termstr.TermStr("foo"), termstr.TermStr("ar")])
self.assertEqual(foo.join(["C", "D"]), termstr.TermStr("CfooD"))
self.assertEqual(foo.join(["C", termstr.TermStr("D")]),
termstr.TermStr("CfooD"))
self.assertEqual(foo.join(["C", termstr.TermStr("D")]), termstr.TermStr("CfooD"))
self.assertEqual(foo.join([]), termstr.TermStr(""))
self.assertEqual(foo.join(["C"]), termstr.TermStr("C"))
bar = termstr.TermStr("bar", bold_style)
@ -107,16 +99,14 @@ class TermStrTests(unittest.TestCase):
self.assertEqual(termstr.TermStr("FOO").lower(), foo)
self.assertEqual(termstr.TermStr("FOO", bold_style).lower(), foo_bold)
self.assertEqual(termstr.TermStr("FOO").swapcase(), foo)
self.assertEqual(termstr.TermStr("FOO", bold_style).swapcase(),
foo_bold)
self.assertEqual(termstr.TermStr("FOO", bold_style).swapcase(), foo_bold)
phrase = termstr.TermStr("foo bar")
self.assertEqual(phrase.title(), termstr.TermStr("Foo Bar"))
self.assertEqual(phrase.capitalize(), termstr.TermStr("Foo bar"))
self.assertEqual(foo.upper(), termstr.TermStr("FOO"))
self.assertEqual(foo_bold.center(0), foo_bold)
self.assertEqual(foo_bold.center(7),
termstr.TermStr(" ") + foo_bold +
termstr.TermStr(" "))
termstr.TermStr(" ") + foo_bold + termstr.TermStr(" "))
self.assertEqual(foo_bold.ljust(0), foo_bold)
self.assertEqual(foo_bold.ljust(5), foo_bold + termstr.TermStr(" "))
self.assertEqual(foo_bold.rjust(0), foo_bold)
@ -129,16 +119,15 @@ class TermStrTests(unittest.TestCase):
def test_from_term(self):
def test_round_trip(term_str):
self.assertEqual(termstr.TermStr.from_term(str(term_str)),
term_str)
self.assertEqual(termstr.TermStr.from_term(str(term_str)), term_str)
test_round_trip(termstr.TermStr("foo"))
test_round_trip(termstr.TermStr("foo").bold())
test_round_trip(termstr.TermStr("foo").underline())
test_round_trip(termstr.TermStr("foo").italic())
test_round_trip(termstr.TermStr("foo").fg_color(termstr.Color.red))
test_round_trip(termstr.TermStr("foo").fg_color(termstr.Color.red).
bg_color(termstr.Color.green))
test_round_trip(
termstr.TermStr("foo").fg_color(termstr.Color.red).bg_color(termstr.Color.green))
test_round_trip(termstr.TermStr("foo").fg_color(1))
test_round_trip(termstr.TermStr("foo").bg_color(10))
self.assertEqual(
@ -147,14 +136,10 @@ class TermStrTests(unittest.TestCase):
termstr.TermStr("foo").fg_color(3))
self.assertEqual(termstr.TermStr.from_term(ESC + "[45mfoo"),
termstr.TermStr("foo").bg_color(5))
self.assertEqual(termstr.TermStr.from_term(ESC + "[45mfoo" +
ESC + "[mbar"),
termstr.TermStr("foo").bg_color(5) +
termstr.TermStr("bar"))
self.assertEqual(termstr.TermStr.from_term(ESC + "[45mfoo" +
ESC + "[0mbar"),
termstr.TermStr("foo").bg_color(5) +
termstr.TermStr("bar"))
self.assertEqual(termstr.TermStr.from_term(ESC + "[45mfoo" + ESC + "[mbar"),
termstr.TermStr("foo").bg_color(5) + termstr.TermStr("bar"))
self.assertEqual(termstr.TermStr.from_term(ESC + "[45mfoo" + ESC + "[0mbar"),
termstr.TermStr("foo").bg_color(5) + termstr.TermStr("bar"))
self.assertEqual(termstr.TermStr.from_term(ESC + "[1;3mfoo"),
termstr.TermStr("foo").bold().italic())
self.assertEqual(termstr.TermStr.from_term(ESC + "[01mfoo"),
@ -165,12 +150,9 @@ class TermStrTests(unittest.TestCase):
termstr.TermStr("foo").fg_color(13))
self.assertEqual(termstr.TermStr.from_term(ESC + "[105mfoo"),
termstr.TermStr("foo").bg_color(13))
self.assertEqual(termstr.TermStr.from_term(ESC + "(B" +
ESC + "[mfoo"),
self.assertEqual(termstr.TermStr.from_term(ESC + "(B" + ESC + "[mfoo"),
termstr.TermStr("foo"))
self.assertEqual(
termstr.TermStr.from_term(ESC + "39;49;00mfoo"),
termstr.TermStr("foo"))
self.assertEqual(termstr.TermStr.from_term(ESC + "39;49;00mfoo"), termstr.TermStr("foo"))
if __name__ == "__main__":