fix: _get_column_letter -> get_column_letter in openpyxl

#443 There's no need for a conditional import as get_column_letter has existed since at laest openpyxl 2.6.0, which is the earliest version we support.
OpenDataServices · Jun 12, 2024 · 10f5b7f · 10f5b7f
1 parent 2d4c280
commit 10f5b7f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Rename _get_column_letter to get_colunmn_letter import for compatibility with
+  latest openpyxl https://github.com/OpenDataServices/flatten-tool/issues/443
+
 ## [0.24.1] - 2024-02-09
 
 ### Fixed

diff --git a/flattentool/input.py b/flattentool/input.py
@@ -24,7 +24,7 @@
 except ImportError:
     SHAPELY_AND_GEOJSON_LIBRARIES_AVAILABLE = False
 
-from openpyxl.utils.cell import _get_column_letter
+from openpyxl.utils.cell import get_column_letter
 
 from flattentool.exceptions import DataErrorWarning
 from flattentool.i18n import _
@@ -386,11 +386,11 @@ def do_unflatten(self):
                                     actual_heading,
                                     ", ".join(
                                         [
-                                            _get_column_letter(x + 1)
+                                            get_column_letter(x + 1)
                                             for x in ignoring[:-1]
                                         ]
                                     ),
-                                    _get_column_letter(ignoring[-1] + 1),
+                                    get_column_letter(ignoring[-1] + 1),
                                     sheet_name,
                                 ),
                                 DataErrorWarning,
@@ -404,8 +404,8 @@ def do_unflatten(self):
                                     )
                                 ).format(
                                     actual_heading,
-                                    _get_column_letter(ignoring[0] + 1),
-                                    _get_column_letter(ignoring[1] + 1),
+                                    get_column_letter(ignoring[0] + 1),
+                                    get_column_letter(ignoring[1] + 1),
                                     sheet_name,
                                 ),
                                 DataErrorWarning,
@@ -419,7 +419,7 @@ def do_unflatten(self):
                                     )
                                 ).format(
                                     actual_heading,
-                                    _get_column_letter(ignoring[0] + 1),
+                                    get_column_letter(ignoring[0] + 1),
                                     sheet_name,
                                 ),
                                 DataErrorWarning,
@@ -445,7 +445,7 @@ def do_unflatten(self):
                     else:
                         cells[header] = Cell(
                             line[header],
-                            (sheet_name, _get_column_letter(k + 1), j + 2, heading),
+                            (sheet_name, get_column_letter(k + 1), j + 2, heading),
                         )
                 unflattened = unflatten_main_with_parser(
                     self.parser,
@@ -740,7 +740,7 @@ def get_sheet_headings(self, sheet_name):
         if self.vertical_orientation:
             return [
                 cell.value
-                for cell in worksheet[_get_column_letter(skip_rows + 1)][
+                for cell in worksheet[get_column_letter(skip_rows + 1)][
                     configuration_line:
                 ]
             ]
@@ -777,7 +777,7 @@ def get_sheet_lines(self, sheet_name):
 
         worksheet = self.workbook[self.sheet_names_map[sheet_name]]
         if self.vertical_orientation:
-            header_row = worksheet[_get_column_letter(skip_rows + 1)]
+            header_row = worksheet[get_column_letter(skip_rows + 1)]
             remaining_rows = worksheet.iter_cols(min_col=skip_rows + header_rows + 1)
             if configuration_line:
                 header_row = header_row[1:]