👕 remove deprecation warnings, related to #24

Author: chfw

Diff for: pyexcel_xlsx/xlsxr.py

@@ -41,10 +41,8 @@ def column_iterator(self, row):
 
 
 class MergedCell(object):
-    def __init__(self, cell_ranges_str):
-        topleft, bottomright = cell_ranges_str.split(':')
-        self.__rl, self.__cl = convert_coordinate(topleft)
-        self.__rh, self.__ch = convert_coordinate(bottomright)
+    def __init__(self, cell_ranges):
+        self.__cl, self.__rl, self.__ch, self.__rh = cell_ranges.bounds
         self.value = None
 
     def register_cells(self, registry):
@@ -60,13 +58,6 @@ def right_column(self):
         return self.__ch
 
 
-def convert_coordinate(cell_coordinate_with_letter):
-    xy = openpyxl.utils.coordinate_from_string(cell_coordinate_with_letter)
-    col = openpyxl.utils.column_index_from_string(xy[0])
-    row = xy[1]
-    return row, col
-
-
 class SlowSheet(FastSheet):
     """
     This sheet will be slower because it does not use readonly sheet
@@ -78,8 +69,8 @@ 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_str in sheet.merged_cell_ranges:
-            merged_cells = MergedCell(ranges_str)
+        for ranges in sheet.merged_cells.ranges[:]:
+            merged_cells = MergedCell(ranges)
             merged_cells.register_cells(self.__merged_cells)
             if self.max_row < merged_cells.bottom_row():
                 self.max_row = merged_cells.bottom_row()
@@ -155,7 +146,7 @@ def open_stream(self, file_stream, skip_hidden_sheets=True,
         self._load_the_excel_file(file_stream)
 
     def read_sheet_by_name(self, sheet_name):
-        sheet = self._native_book.get_sheet_by_name(sheet_name)
+        sheet = self._native_book[sheet_name]
         if sheet is None:
             raise ValueError("%s cannot be found" % sheet_name)
         else:

Diff for: tests/test_merged_cells.py

@@ -1,7 +1,8 @@
 import os
 from pyexcel_xlsx import get_data
-from pyexcel_xlsx.xlsxr import MergedCell, convert_coordinate
+from pyexcel_xlsx.xlsxr import MergedCell
 from nose.tools import eq_
+from openpyxl.worksheet.cell_range import CellRange
 
 
 def test_merged_cells():
@@ -72,7 +73,7 @@ def test_exploration():
 
 def test_merged_cell_class():
     test_dict = {}
-    merged_cell = MergedCell("A7:J8")
+    merged_cell = MergedCell(CellRange(range_string="A7:J8"))
     merged_cell.register_cells(test_dict)
     keys = sorted(list(test_dict.keys()))
     expected = ['7-1', '7-10', '7-2', '7-3', '7-4', '7-5',
@@ -85,11 +86,5 @@ def test_merged_cell_class():
     eq_(merged_cell.right_column(), 10)
 
 
-def test_convert_coordinate():
-    result = convert_coordinate('B5')
-    expected = (5, 2)
-    eq_(result, expected)
-
-
 def get_fixture(file_name):
     return os.path.join("tests", "fixtures", file_name)