From a81c7cf31ae14a1f7b3103b1f2734ed7cbbac83a Mon Sep 17 00:00:00 2001
From: Eric Lapouyade <elapouya@gmail.com>
Date: Mon, 17 Dec 2018 08:57:41 +0100
Subject: [PATCH] Revert "Fix tables that have less cells after the tc forloop"

---
 docxtpl/__init__.py                           |  38 ------------------
 tests/less_cells_after_loop.py                |   5 ---
 .../templates/less_cells_after_loop_tpl.docx  | Bin 4828 -> 0 bytes
 3 files changed, 43 deletions(-)
 delete mode 100644 tests/less_cells_after_loop.py
 delete mode 100644 tests/templates/less_cells_after_loop_tpl.docx

diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py
index ebb5fab..42b8183 100644
--- a/docxtpl/__init__.py
+++ b/docxtpl/__init__.py
@@ -340,44 +340,6 @@ class DocxTemplate(object):
                     for i in range(to_add):
                         etree.SubElement(tblGrid, ns+'gridCol',
                                          {ns+'w': str(int(new_average))})
-
-            # Refetch columns after columns addition.
-            columns = tblGrid.findall(ns + 'gridCol')
-            columns_len = len(columns)
-
-            cells_len_max = 0
-
-            # Calculate max of table cells to compare with `gridCol`.
-            for r in t.iter(ns + 'tr'):
-                cells = r.findall(ns + 'tc')
-                cells_len = len(cells)
-
-                cells_len_max = max(cells_len_max, cells_len)
-
-            to_remove = columns_len - cells_len_max
-
-            # If after the loop, there're less columns, than
-            # originally was, remove extra `gridCol` declarations.
-            if to_remove > 0:
-                # Have to keep track of the removed width to scale the
-                # table back to its original width.
-                removed_width = 0.0
-
-                for c in columns[-to_remove:]:
-                    removed_width += float(c.get(ns + 'w'))
-
-                    tblGrid.remove(c)
-
-                columns_left = tblGrid.findall(ns + 'gridCol')
-
-                # Distribute `removed_width` across all columns that has
-                # left after extras removal.
-                extra_space = removed_width / len(columns_left)
-                extra_space = int(extra_space)
-
-                for c in columns_left:
-                    c.set(ns+'w', str(int(float(c.get(ns+'w')) + extra_space)))
-
         return tree
 
     def new_subdoc(self,docpath=None):
diff --git a/tests/less_cells_after_loop.py b/tests/less_cells_after_loop.py
deleted file mode 100644
index 4e0cd5a..0000000
--- a/tests/less_cells_after_loop.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from docxtpl import DocxTemplate
-
-tpl = DocxTemplate('templates/less_cells_after_loop_tpl.docx')
-tpl.render({})
-tpl.save('output/less_cells_after_loop.docx')
diff --git a/tests/templates/less_cells_after_loop_tpl.docx b/tests/templates/less_cells_after_loop_tpl.docx
deleted file mode 100644
index 43ef566074768ec3f39a06dcddf953abfa5d5970..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4828
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