Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
pyrox0 committed Jul 29, 2024
1 parent 7c43ce8 commit 9f0d480
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions pyexcel_xls/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:copyright: (c) 2016-2021 by Onni Software Ltd
:license: New BSD License
"""

import xlrd

# flake8: noqa
Expand Down
1 change: 1 addition & 0 deletions pyexcel_xls/xlsr.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:copyright: (c) 2016-2021 by Onni Software Ltd
:license: New BSD License
"""

import datetime

import xlrd
Expand Down
1 change: 1 addition & 0 deletions pyexcel_xls/xlsw.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:copyright: (c) 2016-2021 by Onni Software Ltd
:license: New BSD License
"""

import datetime

import xlrd
Expand Down
2 changes: 1 addition & 1 deletion tests/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,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)
Expand Down
3 changes: 1 addition & 2 deletions tests/test_bug_fixes.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
import datetime
from unittest.mock import MagicMock, patch

import pytest
import pyexcel as pe
from _compact import OrderedDict
from pyexcel_xls import XLRD_VERSION_2_OR_ABOVE, save_data
from pyexcel_xls.xlsr import xldate_to_python_date
from pyexcel_xls.xlsw import XLSWriter as Writer

import pytest

IN_TRAVIS = "TRAVIS" in os.environ


Expand Down
5 changes: 2 additions & 3 deletions tests/test_multiple_sheets.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -231,6 +230,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
2 changes: 1 addition & 1 deletion tests/test_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.xls"
writer = Writer(self.testfile, "xls")
Expand Down

0 comments on commit 9f0d480

Please sign in to comment.