Close #12182: Fix pydoc.HTMLDoc.multicolumn() if Python uses the new (true)

division (python -Qnew). Patch written by Ralf W. Grosse-Kunstleve.
This commit is contained in:
Victor Stinner 2011-05-26 13:37:25 +02:00
parent a5392455f6
commit dbfba1667c
3 changed files with 6 additions and 2 deletions

View File

@ -478,9 +478,9 @@ class HTMLDoc(Doc):
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'

View File

@ -458,6 +458,7 @@ Hannu Krosing
Andrej Krpic
Ivan Krstić
Andrew Kuchling
Ralf W. Grosse-Kunstleve
Vladimir Kushnir
Ross Lagerwall
Cameron Laird

View File

@ -83,6 +83,9 @@ Core and Builtins
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