diff --git a/.gitignore b/.gitignore index e8b12f9..a6d7623 100644 --- a/.gitignore +++ b/.gitignore @@ -90,7 +90,7 @@ ipython_config.py # pyenv # For a library or package, you might want to ignore these files since the code is # intended to run in multiple environments; otherwise, check them in: -# .python-version +.python-version # pipenv # According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 933a4be..fae3a43 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -1,10 +1,11 @@ -3 contributors +4 contributors ================================================================================ In alphabetical order: * `Benoit Pierre `_ +* `Craig Anderson `_ * `John Vandenberg `_ * `Stephen J. Fuhry `_ diff --git a/changelog.yml b/changelog.yml index e29bbef..72b1569 100644 --- a/changelog.yml +++ b/changelog.yml @@ -1,6 +1,10 @@ name: pyexcel-xlsx organisation: pyexcel releases: +- changes: + - action: Updated + details: + - 'Compatability with openpyxl 3.1.0 and later' - changes: - action: Updated details: diff --git a/pyexcel_xlsx/xlsxr.py b/pyexcel_xlsx/xlsxr.py index cfa7cee..c32f82c 100644 --- a/pyexcel_xlsx/xlsxr.py +++ b/pyexcel_xlsx/xlsxr.py @@ -69,7 +69,7 @@ def __init__(self, sheet, **keywords): self.max_column = 0 self.__sheet_max_row = sheet.max_row self.__sheet_max_column = sheet.max_column - for ranges in sheet.merged_cells.ranges[:]: + for ranges in list(sheet.merged_cells.ranges)[:]: merged_cells = MergedCell(ranges) merged_cells.register_cells(self.__merged_cells) if self.max_row < merged_cells.bottom_row(): diff --git a/tests/base.py b/tests/base.py index 71474a3..08338bc 100644 --- a/tests/base.py +++ b/tests/base.py @@ -83,7 +83,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) diff --git a/tests/test_multiple_sheets.py b/tests/test_multiple_sheets.py index 7c5160f..50e2ff9 100644 --- a/tests/test_multiple_sheets.py +++ b/tests/test_multiple_sheets.py @@ -247,6 +247,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 diff --git a/tests/test_reader.py b/tests/test_reader.py index 87a4da7..bfb4958 100644 --- a/tests/test_reader.py +++ b/tests/test_reader.py @@ -1,17 +1,17 @@ import os -from datetime import datetime, time +from datetime import time, datetime -from nose.tools import eq_ +from pyexcel_xlsx import get_data from pyexcel_io._compact import OrderedDict -from pyexcel_xlsx import get_data +from nose.tools import eq_ def test_reading(): data = get_data( os.path.join("tests", "fixtures", "date_field.xlsx"), library="pyexcel-xlsx", - skip_hidden_row_and_column=False + skip_hidden_row_and_column=False, ) expected = OrderedDict() expected.update( diff --git a/tests/test_writer.py b/tests/test_writer.py index b54d556..8575f63 100644 --- a/tests/test_writer.py +++ b/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.xlsx" writer = Writer(self.testfile, "xlsx")