@@ -1620,21 +1620,13 @@ def add_protected_range(
16201620
16211621 editor_groups_emails = editor_groups_emails or []
16221622
1623- start , end = name .split (':' )
1624- (row_offset , column_offset ) = a1_to_rowcol (start )
1625- (last_row , last_column ) = a1_to_rowcol (end )
1623+ grid_range = a1_range_to_grid_range (name , self .id )
16261624
16271625 body = {
16281626 "requests" : [{
16291627 "addProtectedRange" : {
16301628 'protectedRange' : {
1631- "range" : {
1632- "sheetId" : self .id ,
1633- "startRowIndex" : row_offset ,
1634- "endRowIndex" : last_row ,
1635- "startColumnIndex" : column_offset ,
1636- "endColumnIndex" : last_column
1637- },
1629+ "range" : grid_range ,
16381630 "description" : description ,
16391631 "warningOnly" : warning_only ,
16401632 "requestingUserCanEdit" : requesting_user_can_edit ,
@@ -1834,27 +1826,15 @@ def set_basic_filter(self, name=None):
18341826 .. versionadded:: 3.4
18351827
18361828 """
1837- rng = {
1838- 'sheetId' : self .id ,
1839- }
18401829
1841- if name is not None :
1842- start , end = name .split (':' )
1843- (row_offset , column_offset ) = a1_to_rowcol (start )
1844- (last_row , last_column ) = a1_to_rowcol (end )
1845- rng ['startRowIndex' ] = row_offset - 1
1846- rng ['endRowIndex' ] = last_row
1847- rng ['startColumnIndex' ] = column_offset - 1
1848- rng ['endColumnIndex' ] = last_column
1849-
1850- filter_settings = {
1851- 'range' : rng
1852- }
1830+ grid_range = a1_range_to_grid_range (name , self .id ) if name is not None else {'sheetId' : self .id }
18531831
18541832 body = {
18551833 'requests' : [{
18561834 'setBasicFilter' : {
1857- 'filter' : filter_settings
1835+ 'filter' : {
1836+ 'range' : grid_range
1837+ }
18581838 }
18591839 }]
18601840 }
@@ -1945,23 +1925,14 @@ def merge_cells(self, name, merge_type="MERGE_ALL"):
19451925 .. MergeType: https://developers.google.com/sheets/api/reference/rest/v4/spreadsheets/request#MergeType
19461926
19471927 """
1948-
1949- start , end = name .split (':' )
1950- (row_offset , column_offset ) = a1_to_rowcol (start )
1951- (last_row , last_column ) = a1_to_rowcol (end )
1928+ grid_range = a1_range_to_grid_range (name , self .id )
19521929
19531930 body = {
19541931 "requests" : [
19551932 {
19561933 "mergeCells" : {
19571934 "mergeType" : merge_type ,
1958- "range" : {
1959- "sheetId" : self .id ,
1960- "startRowIndex" : row_offset - 1 ,
1961- "endRowIndex" : last_row ,
1962- "startColumnIndex" : column_offset - 1 ,
1963- "endColumnIndex" : last_column ,
1964- }
1935+ "range" : grid_range
19651936 }
19661937 }
19671938 ]
0 commit comments