Apply formatter

thombashi · Aug 30, 2020 · 8e3dc51 · 8e3dc51
1 parent 1f70528
commit 8e3dc51
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 42 deletions.
diff --git a/pytablewriter/style/_style.py b/pytablewriter/style/_style.py
@@ -250,8 +250,7 @@ def __ne__(self, other):
         return NotImplemented if equal is NotImplemented else not equal
 
     def update(self, **kwargs) -> None:
-        """Update specified style attributes.
-        """
+        """Update specified style attributes."""
         self.__update(initialize=False, **kwargs)
 
     def __update(self, initialize: bool, **kwargs) -> None:

diff --git a/pytablewriter/writer/_table_writer.py b/pytablewriter/writer/_table_writer.py
@@ -130,8 +130,7 @@ def header_list(self, value):
 
     @property
     def value_matrix(self) -> List:
-        """Data of a table to be outputted.
-        """
+        """Data of a table to be outputted."""
 
         return self.__value_matrix_org
 
@@ -315,8 +314,7 @@ def __clear_preprocess_data(self) -> None:
 
     @property
     def headers(self) -> Sequence[str]:
-        """Headers of a table to be outputted.
-        """
+        """Headers of a table to be outputted."""
 
         return self._dp_extractor.headers
 
@@ -346,8 +344,7 @@ def max_workers(self, value: Optional[int]) -> None:
 
     @property
     def table_name(self) -> str:
-        """Name of a table.
-        """
+        """Name of a table."""
 
         return self._table_name
 
@@ -407,8 +404,7 @@ def type_hints(self, value: Sequence) -> None:
 
     @property
     def default_style(self) -> Style:
-        """Default |Style| of table cells.
-        """
+        """Default |Style| of table cells."""
 
         return self.__default_style
 
@@ -508,8 +504,7 @@ def add_col_separator_style_filter(self, style_filter: ColSeparatorStyleFilterFu
         raise NotImplementedError("this method only implemented in text format writer classes")
 
     def clear_theme(self) -> None:
-        """Remove all of the style filters.
-        """
+        """Remove all of the style filters."""
 
         if not self._style_filters:
             return

diff --git a/pytablewriter/writer/text/_text_writer.py b/pytablewriter/writer/text/_text_writer.py
@@ -182,8 +182,7 @@ def add_col_separator_style_filter(self, style_filter: ColSeparatorStyleFilterFu
         self._clear_preprocess()
 
     def clear_theme(self) -> None:
-        """Remove all of the style filters.
-        """
+        """Remove all of the style filters."""
 
         super().clear_theme()
 
@@ -359,7 +358,8 @@ def __get_row_separator_items(self, margin_format: str, separator_char: str) ->
 
     def _get_header_format_string(self, col_dp: ColumnDataProperty, value_dp: DataProperty) -> str:
         return "{{:{:s}{:s}}}".format(
-            get_align_char(Align.CENTER), str(self._get_padding_len(col_dp, value_dp)),
+            get_align_char(Align.CENTER),
+            str(self._get_padding_len(col_dp, value_dp)),
         )
 
     def _to_header_item(self, col_dp: ColumnDataProperty, value_dp: DataProperty) -> str:
@@ -420,7 +420,9 @@ def __to_column_delimiter(
             )
 
         style = self._fetch_col_separator_style(
-            left_cell=left_cell, right_cell=right_cell, default_style=self.default_style,
+            left_cell=left_cell,
+            right_cell=right_cell,
+            default_style=self.default_style,
         )
 
         return self._styler.apply_terminal_style(col_delimiter, style=style)
@@ -432,7 +434,10 @@ def _write_row(self, row: int, values: Sequence[str]) -> None:
         col_delimiters = (
             [
                 self.__to_column_delimiter(
-                    row, None, self._column_dp_list[0], self.char_left_side_row,
+                    row,
+                    None,
+                    self._column_dp_list[0],
+                    self.char_left_side_row,
                 )
             ]
             + [
@@ -446,7 +451,10 @@ def _write_row(self, row: int, values: Sequence[str]) -> None:
             ]
             + [
                 self.__to_column_delimiter(
-                    row, self._column_dp_list[-1], None, self.char_right_side_row,
+                    row,
+                    self._column_dp_list[-1],
+                    None,
+                    self.char_right_side_row,
                 )
             ]
         )
@@ -556,14 +564,12 @@ def set_indent_level(self, indent_level: int) -> None:
         self._indent_level = indent_level
 
     def inc_indent_level(self) -> None:
-        """Increment the indentation level.
-        """
+        """Increment the indentation level."""
 
         self._indent_level += 1
 
     def dec_indent_level(self) -> None:
-        """Decrement the indentation level.
-        """
+        """Decrement the indentation level."""
 
         self._indent_level -= 1
 

diff --git a/pytablewriter/writer/text/_toml.py b/pytablewriter/writer/text/_toml.py
@@ -72,7 +72,8 @@ def __init__(self, _dict=dict, preserve=False):
                 row = {}
 
                 for header, value in zip(
-                    self.headers, [serialize_dp(value_dp) for value_dp in value_dp_list],
+                    self.headers,
+                    [serialize_dp(value_dp) for value_dp in value_dp_list],
                 ):
                     if typepy.is_null_string(value):
                         continue

diff --git a/test/data.py b/test/data.py
@@ -42,7 +42,18 @@
     "time",
 ]
 mix_value_matrix = [
-    [1, 1.1, "aa", 1, 1, True, INF, NAN, 1.0, TIME,],
+    [
+        1,
+        1.1,
+        "aa",
+        1,
+        1,
+        True,
+        INF,
+        NAN,
+        1.0,
+        TIME,
+    ],
     [
         2,
         2.2,
@@ -55,7 +66,18 @@
         INF,
         "2017-01-02 03:04:05+09:00",
     ],
-    [3, 3.33, "cccc", -3, "ccc", True, float("infinity"), float("NAN"), NAN, TIME,],
+    [
+        3,
+        3.33,
+        "cccc",
+        -3,
+        "ccc",
+        True,
+        float("infinity"),
+        float("NAN"),
+        NAN,
+        TIME,
+    ],
 ]
 mix_tabledata = TableData(table_name="mix data", headers=mix_header_list, rows=mix_value_matrix)
 
@@ -70,15 +92,33 @@
 )
 
 value_matrix_iter = [
-    [[1, 2, 3], [11, 12, 13],],
-    [[1, 2, 3], [11, 12, 13],],
-    [[101, 102, 103], [1001, 1002, 1003],],
+    [
+        [1, 2, 3],
+        [11, 12, 13],
+    ],
+    [
+        [1, 2, 3],
+        [11, 12, 13],
+    ],
+    [
+        [101, 102, 103],
+        [1001, 1002, 1003],
+    ],
 ]
 
 value_matrix_iter_1 = [
-    [["a b c d e f g h i jklmn", 2.1, 3], ["aaaaa", 12.1, 13],],
-    [["bbb", 2, 3], ["cc", 12, 13],],
-    [["a", 102, 103], ["", 1002, 1003],],
+    [
+        ["a b c d e f g h i jklmn", 2.1, 3],
+        ["aaaaa", 12.1, 13],
+    ],
+    [
+        ["bbb", 2, 3],
+        ["cc", 12, 13],
+    ],
+    [
+        ["a", 102, 103],
+        ["", 1002, 1003],
+    ],
 ]
 
 Data = collections.namedtuple("Data", "table indent header value expected")

diff --git a/test/test_style.py b/test/test_style.py
@@ -19,7 +19,8 @@
 
 class Test_Cell_is_header_row:
     @pytest.mark.parametrize(
-        ["row", "expected"], [[-1, True], [0, False], [sys.maxsize, False]],
+        ["row", "expected"],
+        [[-1, True], [0, False], [sys.maxsize, False]],
     )
     def test_normal(self, row, expected):
         cell = Cell(row=row, col=0, value=None, default_style=None)

diff --git a/test/test_table_format.py b/test/test_table_format.py
@@ -52,7 +52,11 @@ def test_normal(self, value, expected):
 class Test_TableFormat_from_name:
     @pytest.mark.parametrize(
         ["value", "expected"],
-        [["csv", TableFormat.CSV], ["CSV", TableFormat.CSV], ["excel", TableFormat.EXCEL_XLSX],],
+        [
+            ["csv", TableFormat.CSV],
+            ["CSV", TableFormat.CSV],
+            ["excel", TableFormat.EXCEL_XLSX],
+        ],
     )
     def test_normal(self, value, expected):
         assert TableFormat.from_name(value) == expected

diff --git a/test/writer/text/test_json_writer.py b/test/writer/text/test_json_writer.py
@@ -207,7 +207,12 @@
 ]
 
 exception_test_data_list = [
-    Data(table="", header=[], value=normal_test_data_list[0].value, expected=ValueError,),
+    Data(
+        table="",
+        header=[],
+        value=normal_test_data_list[0].value,
+        expected=ValueError,
+    ),
 ]
 
 table_writer_class = pytablewriter.JsonTableWriter

diff --git a/test/writer/text/test_latex_table_writer.py b/test/writer/text/test_latex_table_writer.py
@@ -58,7 +58,11 @@
 \end{array}
 """,
     ),
-    Data(header=[], value=[], expected="",),
+    Data(
+        header=[],
+        value=[],
+        expected="",
+    ),
 ]
 
 

diff --git a/test/writer/text/test_markdown_writer.py b/test/writer/text/test_markdown_writer.py
@@ -392,7 +392,14 @@
             """
         ),
     ),
-    Data(table="", indent=0, header=[], value=[], is_formatting_float=True, expected="",),
+    Data(
+        table="",
+        indent=0,
+        header=[],
+        value=[],
+        is_formatting_float=True,
+        expected="",
+    ),
 ]
 
 table_writer_class = ptw.MarkdownTableWriter
@@ -422,7 +429,10 @@ def test_normal_kwargs(self):
         writer = table_writer_class(
             headers=["w/ strike", "w/ line through"],
             value_matrix=[["strike", "line-through"]],
-            column_styles=[Style(decoration_line="strike"), Style(decoration_line="line-through"),],
+            column_styles=[
+                Style(decoration_line="strike"),
+                Style(decoration_line="line-through"),
+            ],
         )
 
         expected = dedent(

diff --git a/test/writer/text/test_numpy_writer.py b/test/writer/text/test_numpy_writer.py
@@ -165,7 +165,13 @@ def test_exception(self, table, indent, header, value, expected):
         [
             [data.table, data.indent, data.header, data.value, data.expected]
             for data in [
-                Data(table=None, indent=0, header=headers, value=value_matrix, expected="",)
+                Data(
+                    table=None,
+                    indent=0,
+                    header=headers,
+                    value=value_matrix,
+                    expected="",
+                )
             ]
         ],
     )

diff --git a/test/writer/text/test_pandas_writer.py b/test/writer/text/test_pandas_writer.py
@@ -124,7 +124,13 @@
             """
         ),
     ),
-    Data(table="empty", indent=0, header=[], value=[], expected="",),
+    Data(
+        table="empty",
+        indent=0,
+        header=[],
+        value=[],
+        expected="",
+    ),
 ]
 
 exception_test_data_list = [

diff --git a/test/writer/text/test_unicode_writer.py b/test/writer/text/test_unicode_writer.py
@@ -15,7 +15,11 @@
 
 class Test_UnicodeTableWriter_write_new_line:
     @pytest.mark.parametrize(
-        ["table_writer_class"], [[UnicodeTableWriter], [BoldUnicodeTableWriter],]
+        ["table_writer_class"],
+        [
+            [UnicodeTableWriter],
+            [BoldUnicodeTableWriter],
+        ],
     )
     def test_normal(self, capsys, table_writer_class):
         writer = table_writer_class()

diff --git a/test/writer/text/test_yaml_writer.py b/test/writer/text/test_yaml_writer.py
@@ -55,7 +55,11 @@
         ),
     ),
     Data(
-        tabledata=TableData(table_name=None, headers=[], rows=value_matrix,),
+        tabledata=TableData(
+            table_name=None,
+            headers=[],
+            rows=value_matrix,
+        ),
         expected=dedent(
             """\
             - - 1
@@ -118,7 +122,8 @@ def test_normal(self, capsys):
 
 class Test_YamlTableWriter_write_table:
     @pytest.mark.parametrize(
-        ["value", "expected"], [[data.tabledata, data.expected] for data in normal_test_data_list],
+        ["value", "expected"],
+        [[data.tabledata, data.expected] for data in normal_test_data_list],
     )
     def test_normal(self, capsys, value, expected):
         writer = table_writer_class()