Close #12182: Fix pydoc.HTMLDoc.multicolumn() if Python uses the new (true) division (python -Qnew). Patch written by Ralf W. Grosse-Kunstleve.
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 8b6f7ee..f119404 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py
@@ -478,9 +478,9 @@ def multicolumn(self, list, format, cols=4): """Format a list of items into a multi-column list.""" result = '' - rows = (len(list)+cols-1)/cols + rows = (len(list)+cols-1)//cols for col in range(cols): - result = result + '<td width="%d%%" valign=top>' % (100/cols) + result = result + '<td width="%d%%" valign=top>' % (100//cols) for i in range(rows*col, rows*col+rows): if i < len(list): result = result + format(list[i]) + '<br>\n'
diff --git a/Misc/ACKS b/Misc/ACKS index 4270934..164473f 100644 --- a/Misc/ACKS +++ b/Misc/ACKS
@@ -458,6 +458,7 @@ Andrej Krpic Ivan Krstić Andrew Kuchling +Ralf W. Grosse-Kunstleve Vladimir Kushnir Ross Lagerwall Cameron Laird
diff --git a/Misc/NEWS b/Misc/NEWS index 0f2049b..e34bd48 100644 --- a/Misc/NEWS +++ b/Misc/NEWS
@@ -83,6 +83,9 @@ Library ------- +- Issue #12182: Fix pydoc.HTMLDoc.multicolumn() if Python uses the new (true) + division (python -Qnew). Patch written by Ralf W. Grosse-Kunstleve. + - Issue #12175: RawIOBase.readall() now returns None if read() returns None. - Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError