format

Author: pyrox0

pyexcel_ods/odsr.py

@@ -7,6 +7,7 @@
     :copyright: (c) 2014-2020 by Onni Software Ltd.
     :license: New BSD License, see LICENSE for more details
 """
+
 # Copyright 2011 Marco Conti
 
 # Licensed under the Apache License, Version 2.0 (the "License");

pyexcel_ods/odsw.py

@@ -7,6 +7,7 @@
     :copyright: (c) 2014-2020 by Onni Software Ltd.
     :license: New BSD License, see LICENSE for more details
 """
+
 import pyexcel_io.service as converter
 from odf.text import P
 from odf.table import Table, TableRow, TableCell

tests/base.py

@@ -1,9 +1,9 @@
 import os  # noqa
 import datetime  # noqa
 
+import pytest
 import pyexcel
 
-import pytest
 
 def create_sample_file1(file):
     data = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", 1.1, 1]
@@ -82,7 +82,7 @@ def test_reading_through_sheets(self):
         expected = [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]]
         assert data == expected
         data = list(b["Sheet3"].rows())
-        expected = [[u"X", u"Y", u"Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
+        expected = [["X", "Y", "Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
         assert data == expected
         sheet3 = b["Sheet3"]
         sheet3.name_columns_by_row(0)
@@ -105,9 +105,9 @@ def test_formats(self):
         assert self.data["Sheet1"][1][1].strftime(time_format) == "12:12:11"
         assert self.data["Sheet1"][2][1].strftime(time_format) == "12:00:00"
         assert self.data["Sheet1"][3][1] == 0
-        assert (
-            self.data["Sheet1"][4][1] ==
-            datetime.timedelta(hours=27, minutes=17, seconds=54))
+        assert self.data["Sheet1"][4][1] == datetime.timedelta(
+            hours=27, minutes=17, seconds=54
+        )
         assert self.data["Sheet1"][5][1] == "Other"
         # boolean
         assert self.data["Sheet1"][0][2] == "Boolean"

tests/test_bug_fixes.py

@@ -3,12 +3,11 @@
 import os
 
 import psutil
+import pytest
 import pyexcel as pe
 from pyexcel_ods import get_data, save_data
 from pyexcel_io.exceptions import IntegerAccuracyLossError
 
-import pytest
-
 IN_TRAVIS = "TRAVIS" in os.environ
 
 
@@ -20,10 +19,10 @@ def test_bug_fix_for_issue_1():
 def test_bug_fix_for_issue_2():
     data = {}
     data.update({"Sheet 1": [[1, 2, 3], [4, 5, 6]]})
-    data.update({"Sheet 2": [[u"row 1", u"Héllô!", u"HolÁ!"]]})
+    data.update({"Sheet 2": [["row 1", "Héllô!", "HolÁ!"]]})
     save_data("your_file.ods", data)
     new_data = get_data("your_file.ods")
-    assert new_data["Sheet 2"] == [[u"row 1", u"H\xe9ll\xf4!", u"Hol\xc1!"]]
+    assert new_data["Sheet 2"] == [["row 1", "H\xe9ll\xf4!", "Hol\xc1!"]]
 
 
 def test_invalid_date():
@@ -33,7 +32,6 @@ def test_invalid_date():
         value = "2015-08-"
         date_value(value)
 
-
     with pytest.raises(Exception):
         from pyexcel_ods.ods import date_value
 
@@ -67,7 +65,7 @@ def test_issue_14():
     # pyexcel issue 61
     test_file = "issue_61.ods"
     data = get_data(get_fixtures(test_file), skip_empty_rows=True)
-    assert data["S-LMC"] == [[u"aaa"], [0]]
+    assert data["S-LMC"] == [["aaa"], [0]]
 
 
 def test_issue_6():
@@ -114,7 +112,9 @@ def test_issue_83_ods_file_handle():
 def test_pr_22():
     test_file = get_fixtures("white_space.ods")
     data = get_data(test_file)
-    assert data["Sheet1"][0][0] == "paragraph with tab(\t),    space, \nnew line"
+    assert (
+        data["Sheet1"][0][0] == "paragraph with tab(\t),    space, \nnew line"
+    )
 
 
 def test_issue_23():

tests/test_multiple_sheets.py

@@ -1,11 +1,10 @@
 import os
 import sys
 
+import pytest
 import pyexcel
 from base import PyexcelMultipleSheetBase
 
-import pytest
-
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     from ordereddict import OrderedDict
 else:
@@ -241,6 +240,6 @@ def _produce_ordered_dict():
     data_dict.update({"Sheet1": [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]]})
     data_dict.update({"Sheet2": [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]]})
     data_dict.update(
-        {"Sheet3": [[u"X", u"Y", u"Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]}
+        {"Sheet3": [["X", "Y", "Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]}
     )
     return data_dict

tests/test_writer.py

@@ -10,7 +10,7 @@ def test_write_book(self):
         self.content = {
             "Sheet1": [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]],
             "Sheet2": [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]],
-            "Sheet3": [[u"X", u"Y", u"Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]],
+            "Sheet3": [["X", "Y", "Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]],
         }
         self.testfile = "writer.ods"
         writer = Writer(self.testfile, "ods")