summaryrefslogtreecommitdiff
path: root/tests/utils_tests
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-10-26 12:15:03 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2013-10-26 12:15:03 -0700
commit9d740eb8b15de31f1c5520659df683d90342bb44 (patch)
tree62b6ff49e5a60467828f9b04d46b6ebeac86c333 /tests/utils_tests
parentf2d8027c9aea93750fc4213d9e733c8575e89502 (diff)
Fix all violators of E231
Diffstat (limited to 'tests/utils_tests')
-rw-r--r--tests/utils_tests/test_datastructures.py14
-rw-r--r--tests/utils_tests/test_html.py2
-rw-r--r--tests/utils_tests/test_termcolors.py60
3 files changed, 38 insertions, 38 deletions
diff --git a/tests/utils_tests/test_datastructures.py b/tests/utils_tests/test_datastructures.py
index ca89e8541d..de63730379 100644
--- a/tests/utils_tests/test_datastructures.py
+++ b/tests/utils_tests/test_datastructures.py
@@ -139,14 +139,14 @@ class SortedDictTests(IgnorePendingDeprecationWarningsMixin, SimpleTestCase):
class MergeDictTests(IgnorePendingDeprecationWarningsMixin, SimpleTestCase):
def test_simple_mergedict(self):
- d1 = {'chris':'cool', 'camri':'cute', 'cotton':'adorable',
- 'tulip':'snuggable', 'twoofme':'firstone'}
+ d1 = {'chris': 'cool', 'camri': 'cute', 'cotton': 'adorable',
+ 'tulip': 'snuggable', 'twoofme': 'firstone'}
- d2 = {'chris2':'cool2', 'camri2':'cute2', 'cotton2':'adorable2',
- 'tulip2':'snuggable2'}
+ d2 = {'chris2': 'cool2', 'camri2': 'cute2', 'cotton2': 'adorable2',
+ 'tulip2': 'snuggable2'}
- d3 = {'chris3':'cool3', 'camri3':'cute3', 'cotton3':'adorable3',
- 'tulip3':'snuggable3'}
+ d3 = {'chris3': 'cool3', 'camri3': 'cute3', 'cotton3': 'adorable3',
+ 'tulip3': 'snuggable3'}
md = MergeDict(d1, d2, d3)
@@ -183,7 +183,7 @@ class MergeDictTests(IgnorePendingDeprecationWarningsMixin, SimpleTestCase):
[('key1', 'value1'), ('key2', 'value3'),
('key4', 'value6')])
- self.assertEqual([(k,mm.getlist(k)) for k in sorted(mm)],
+ self.assertEqual([(k, mm.getlist(k)) for k in sorted(mm)],
[('key1', ['value1']),
('key2', ['value2', 'value3']),
('key4', ['value5', 'value6'])])
diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
index ddfc67c1f1..cafdee5c03 100644
--- a/tests/utils_tests/test_html.py
+++ b/tests/utils_tests/test_html.py
@@ -24,7 +24,7 @@ class TestUtilsHtml(TestCase):
def test_escape(self):
f = html.escape
items = (
- ('&','&amp;'),
+ ('&', '&amp;'),
('<', '&lt;'),
('>', '&gt;'),
('"', '&quot;'),
diff --git a/tests/utils_tests/test_termcolors.py b/tests/utils_tests/test_termcolors.py
index 3a74244c09..633debb86e 100644
--- a/tests/utils_tests/test_termcolors.py
+++ b/tests/utils_tests/test_termcolors.py
@@ -17,33 +17,33 @@ class TermColorTests(unittest.TestCase):
def test_fg(self):
self.assertEqual(parse_color_setting('error=green'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
def test_fg_bg(self):
self.assertEqual(parse_color_setting('error=green/blue'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'bg':'blue'}))
+ ERROR={'fg': 'green', 'bg': 'blue'}))
def test_fg_opts(self):
self.assertEqual(parse_color_setting('error=green,blink'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'opts': ('blink',)}))
+ ERROR={'fg': 'green', 'opts': ('blink',)}))
self.assertEqual(parse_color_setting('error=green,bold,blink'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'opts': ('blink','bold')}))
+ ERROR={'fg': 'green', 'opts': ('blink', 'bold')}))
def test_fg_bg_opts(self):
self.assertEqual(parse_color_setting('error=green/blue,blink'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'bg':'blue', 'opts': ('blink',)}))
+ ERROR={'fg': 'green', 'bg': 'blue', 'opts': ('blink',)}))
self.assertEqual(parse_color_setting('error=green/blue,bold,blink'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'bg':'blue', 'opts': ('blink','bold')}))
+ ERROR={'fg': 'green', 'bg': 'blue', 'opts': ('blink', 'bold')}))
def test_override_palette(self):
self.assertEqual(parse_color_setting('light;error=green'),
dict(PALETTES[LIGHT_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
def test_override_nocolor(self):
self.assertEqual(parse_color_setting('nocolor;error=green'),
@@ -56,14 +56,14 @@ class TermColorTests(unittest.TestCase):
def test_multiple_roles(self):
self.assertEqual(parse_color_setting('error=green;sql_field=blue'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'},
- SQL_FIELD={'fg':'blue'}))
+ ERROR={'fg': 'green'},
+ SQL_FIELD={'fg': 'blue'}))
def test_override_with_multiple_roles(self):
self.assertEqual(parse_color_setting('light;error=green;sql_field=blue'),
dict(PALETTES[LIGHT_PALETTE],
- ERROR={'fg':'green'},
- SQL_FIELD={'fg':'blue'}))
+ ERROR={'fg': 'green'},
+ SQL_FIELD={'fg': 'blue'}))
def test_empty_definition(self):
self.assertEqual(parse_color_setting(';'), None)
@@ -73,13 +73,13 @@ class TermColorTests(unittest.TestCase):
def test_empty_options(self):
self.assertEqual(parse_color_setting('error=green,'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
self.assertEqual(parse_color_setting('error=green,,,'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
self.assertEqual(parse_color_setting('error=green,,blink,,'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'opts': ('blink',)}))
+ ERROR={'fg': 'green', 'opts': ('blink',)}))
def test_bad_palette(self):
self.assertEqual(parse_color_setting('unknown'), None)
@@ -89,66 +89,66 @@ class TermColorTests(unittest.TestCase):
self.assertEqual(parse_color_setting('unknown=green'), None)
self.assertEqual(parse_color_setting('unknown=green;sql_field=blue'),
dict(PALETTES[NOCOLOR_PALETTE],
- SQL_FIELD={'fg':'blue'}))
+ SQL_FIELD={'fg': 'blue'}))
def test_bad_color(self):
self.assertEqual(parse_color_setting('error='), None)
self.assertEqual(parse_color_setting('error=;sql_field=blue'),
dict(PALETTES[NOCOLOR_PALETTE],
- SQL_FIELD={'fg':'blue'}))
+ SQL_FIELD={'fg': 'blue'}))
self.assertEqual(parse_color_setting('error=unknown'), None)
self.assertEqual(parse_color_setting('error=unknown;sql_field=blue'),
dict(PALETTES[NOCOLOR_PALETTE],
- SQL_FIELD={'fg':'blue'}))
+ SQL_FIELD={'fg': 'blue'}))
self.assertEqual(parse_color_setting('error=green/unknown'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
self.assertEqual(parse_color_setting('error=green/blue/something'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'bg': 'blue'}))
+ ERROR={'fg': 'green', 'bg': 'blue'}))
self.assertEqual(parse_color_setting('error=green/blue/something,blink'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'bg': 'blue', 'opts': ('blink',)}))
+ ERROR={'fg': 'green', 'bg': 'blue', 'opts': ('blink',)}))
def test_bad_option(self):
self.assertEqual(parse_color_setting('error=green,unknown'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
self.assertEqual(parse_color_setting('error=green,unknown,blink'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'opts': ('blink',)}))
+ ERROR={'fg': 'green', 'opts': ('blink',)}))
def test_role_case(self):
self.assertEqual(parse_color_setting('ERROR=green'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
self.assertEqual(parse_color_setting('eRrOr=green'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
def test_color_case(self):
self.assertEqual(parse_color_setting('error=GREEN'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
self.assertEqual(parse_color_setting('error=GREEN/BLUE'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'bg':'blue'}))
+ ERROR={'fg': 'green', 'bg': 'blue'}))
self.assertEqual(parse_color_setting('error=gReEn'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green'}))
+ ERROR={'fg': 'green'}))
self.assertEqual(parse_color_setting('error=gReEn/bLuE'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'bg':'blue'}))
+ ERROR={'fg': 'green', 'bg': 'blue'}))
def test_opts_case(self):
self.assertEqual(parse_color_setting('error=green,BLINK'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'opts': ('blink',)}))
+ ERROR={'fg': 'green', 'opts': ('blink',)}))
self.assertEqual(parse_color_setting('error=green,bLiNk'),
dict(PALETTES[NOCOLOR_PALETTE],
- ERROR={'fg':'green', 'opts': ('blink',)}))
+ ERROR={'fg': 'green', 'opts': ('blink',)}))
def test_colorize_empty_text(self):
self.assertEqual(colorize(text=None), '\x1b[m\x1b[0m')