Merge branch 'aws-loader' of github.com:frictionlessdata/tabulator-py…

… into aws-loader
frictionlessdata · Sep 18, 2019 · 9701035 · 9701035
2 parents 6091768 + c02b216
commit 9701035
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@ def read(*paths):
     # Format: xls
     'xlrd>=1.0',
     # Format: xlsx
-    'openpyxl>=2.4,<2.5',
+    'openpyxl>=2.6',
 ]
 INSTALL_FORMAT_DATAPACKAGE_REQUIRES = [
     'datapackage>=1.1.3',

diff --git a/tabulator/parsers/xlsx.py b/tabulator/parsers/xlsx.py
@@ -103,7 +103,9 @@ def __iter_extended_rows(self):
 
     def __process_merged_cells(self):
         if self.__fill_merged_cells:
-            for merged_cell_range in self.__sheet.merged_cell_ranges:
+            for merged_cell_range in self.__sheet.merged_cells.ranges:
+                merged_cell_range = str(merged_cell_range)
+                self.__sheet.unmerge_cells(merged_cell_range)
                 merged_rows = openpyxl.utils.rows_from_range(merged_cell_range)
                 coordinates = list(chain(*merged_rows))
                 value = self.__sheet[coordinates[0]].value