This is a note to let you know that I've just added the patch titled docs: sphinx-extensions: make rstFlatTable work with docutils 0.13 to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: docs-sphinx-extensions-make-rstflattable-work-with-docutils-0.13.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 217e2bfab22e740227df09f22165e834cddd8a3b Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev <mitya57@xxxxxxxxxx> Date: Sun, 18 Dec 2016 13:11:46 +0300 Subject: docs: sphinx-extensions: make rstFlatTable work with docutils 0.13 From: Dmitry Shachnev <mitya57@xxxxxxxxxx> commit 217e2bfab22e740227df09f22165e834cddd8a3b upstream. In docutils 0.13, the return type of get_column_widths method of the Table directive has changed [1], which breaks our flat-table directive and leads to a TypeError when trying to build the docs [2]. This patch adds support for the new return type, while keeping support for older docutils versions too. [1] https://sourceforge.net/p/docutils/patches/120/ [2] https://sourceforge.net/p/docutils/bugs/303/ Signed-off-by: Dmitry Shachnev <mitya57@xxxxxxxxxx> Signed-off-by: Jonathan Corbet <corbet@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- Documentation/sphinx/rstFlatTable.py | 5 +++++ 1 file changed, 5 insertions(+) --- a/Documentation/sphinx/rstFlatTable.py +++ b/Documentation/sphinx/rstFlatTable.py @@ -157,6 +157,11 @@ class ListTableBuilder(object): def buildTableNode(self): colwidths = self.directive.get_column_widths(self.max_cols) + if isinstance(colwidths, tuple): + # Since docutils 0.13, get_column_widths returns a (widths, + # colwidths) tuple, where widths is a string (i.e. 'auto'). + # See https://sourceforge.net/p/docutils/patches/120/. + colwidths = colwidths[1] stub_columns = self.directive.options.get('stub-columns', 0) header_rows = self.directive.options.get('header-rows', 0) Patches currently in stable-queue which might be from mitya57@xxxxxxxxxx are queue-4.9/docs-sphinx-extensions-make-rstflattable-work-with-docutils-0.13.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html