Skip to content

Commit e9345cc

Browse files
author
Steve Canny
committed
tbl: remove dead tbl param from _Column.__init__
1 parent dbba250 commit e9345cc

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

docx/table.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def add_column(self):
2727
gridCol = tblGrid.add_gridCol()
2828
for tr in self._tbl.tr_lst:
2929
tr.add_tc()
30-
return _Column(gridCol, self._tbl, self)
30+
return _Column(gridCol, self)
3131

3232
def add_row(self):
3333
"""
@@ -242,10 +242,9 @@ class _Column(Parented):
242242
"""
243243
Table column
244244
"""
245-
def __init__(self, gridCol, tbl, parent):
245+
def __init__(self, gridCol, parent):
246246
super(_Column, self).__init__(parent)
247247
self._gridCol = gridCol
248-
self._tbl = tbl
249248

250249
@property
251250
def cells(self):
@@ -299,11 +298,11 @@ def __getitem__(self, idx):
299298
except IndexError:
300299
msg = "column index [%d] is out of range" % idx
301300
raise IndexError(msg)
302-
return _Column(gridCol, self._tbl, self)
301+
return _Column(gridCol, self)
303302

304303
def __iter__(self):
305304
for gridCol in self._gridCol_lst:
306-
yield _Column(gridCol, self._tbl, self)
305+
yield _Column(gridCol, self)
307306

308307
def __len__(self):
309308
return len(self._gridCol_lst)

tests/test_table.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ def it_knows_its_index_in_table_to_help(self, index_fixture):
447447

448448
@pytest.fixture
449449
def cells_fixture(self, _index_, table_prop_, table_):
450-
column = _Column(None, None, None)
450+
column = _Column(None, None)
451451
_index_.return_value = column_idx = 4
452452
expected_cells = (3, 2, 1)
453453
table_.column_cells.return_value = list(expected_cells)
@@ -457,12 +457,12 @@ def cells_fixture(self, _index_, table_prop_, table_):
457457
def index_fixture(self):
458458
tbl = element('w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)')
459459
gridCol, expected_idx = tbl.tblGrid[1], 1
460-
column = _Column(gridCol, tbl, None)
460+
column = _Column(gridCol, None)
461461
return column, expected_idx
462462

463463
@pytest.fixture
464464
def table_fixture(self, parent_, table_):
465-
column = _Column(None, None, parent_)
465+
column = _Column(None, parent_)
466466
parent_.table = table_
467467
return column, table_
468468

@@ -476,7 +476,7 @@ def table_fixture(self, parent_, table_):
476476
])
477477
def width_get_fixture(self, request):
478478
gridCol_cxml, expected_width = request.param
479-
column = _Column(element(gridCol_cxml), None, None)
479+
column = _Column(element(gridCol_cxml), None)
480480
return column, expected_width
481481

482482
@pytest.fixture(params=[
@@ -487,7 +487,7 @@ def width_get_fixture(self, request):
487487
])
488488
def width_set_fixture(self, request):
489489
gridCol_cxml, new_value, expected_cxml = request.param
490-
column = _Column(element(gridCol_cxml), None, None)
490+
column = _Column(element(gridCol_cxml), None)
491491
expected_xml = xml(expected_cxml)
492492
return column, new_value, expected_xml
493493

0 commit comments

Comments
 (0)