Mailman 3 May 2008 - Python-checkins

r63835 - peps/trunk/pep-3138.txt
by guido.van.rossum May 31, 2008

May 31, 2008

Author: guido.van.rossum Date: Sat May 31 18:33:45 2008 New Revision: 63835 Log: Clarify a sentence by adding a comma, and add back a \ that was dropped in front of an x. Modified: peps/trunk/pep-3138.txt Modified: peps/trunk/pep-3138.txt ============================================================================== --- peps/trunk/pep-3138.txt (original) +++ peps/trunk/pep-3138.txt Sat May 31 18:33:45 2008 @@ -74,9 +74,9 @@ * Convert leading surrogate pair characters without trailing character (0xd800-0xdbff, but not followed by 0xdc00-0xdfff) to '\\uXXXX'. - * Convert Unicode whitespace other than ASCII space('\\x20') and - control characters (categories Z* and C* in the Unicode database) - to 'xXX', '\\uXXXX' or '\\U00xxxxxx'. + * Convert Unicode whitespace other than ASCII space('\\x20'), and + control characters (categories Z* and C* in the Unicode database), + to '\\xXX', '\\uXXXX' or '\\U00xxxxxx'. - Set the Unicode error-handler for sys.stdout and sys.stderr to 'backslashreplace' by default.

1 0

r63834 - in doctools/trunk/sphinx/static: default.css sphinxdoc.css
by georg.brandl May 31, 2008

May 31, 2008

Author: georg.brandl Date: Sat May 31 18:26:12 2008 New Revision: 63834 Log: Style fix for lists inside lists. Modified: doctools/trunk/sphinx/static/default.css doctools/trunk/sphinx/static/sphinxdoc.css Modified: doctools/trunk/sphinx/static/default.css ============================================================================== --- doctools/trunk/sphinx/static/default.css (original) +++ doctools/trunk/sphinx/static/default.css Sat May 31 18:26:12 2008 @@ -566,6 +566,10 @@ padding: 0; } +.first { + margin-top: 0 !important; +} + /* "Footnotes" heading */ p.rubric { margin-top: 30px; Modified: doctools/trunk/sphinx/static/sphinxdoc.css ============================================================================== --- doctools/trunk/sphinx/static/sphinxdoc.css (original) +++ doctools/trunk/sphinx/static/sphinxdoc.css Sat May 31 18:26:12 2008 @@ -139,6 +139,10 @@ text-decoration: underline; } +.first { + margin-top: 0 !important; +} + div.document { background-color: white; text-align: left;

1 0

r63833 - in doctools/trunk: CHANGES doc/conf.py doc/ext/appapi.rst sphinx sphinx/application.py sphinx/builder.py sphinx/templates/layout.html sphinx/templates/web/settings.html
by georg.brandl May 31, 2008

May 31, 2008

Author: georg.brandl Date: Sat May 31 18:14:36 2008 New Revision: 63833 Log: Add html-page-context event for customizing the template context. Modified: doctools/trunk/CHANGES doctools/trunk/doc/conf.py doctools/trunk/doc/ext/appapi.rst doctools/trunk/sphinx/ (props changed) doctools/trunk/sphinx/application.py doctools/trunk/sphinx/builder.py doctools/trunk/sphinx/templates/layout.html doctools/trunk/sphinx/templates/web/settings.html Modified: doctools/trunk/CHANGES ============================================================================== --- doctools/trunk/CHANGES (original) +++ doctools/trunk/CHANGES Sat May 31 18:14:36 2008 @@ -28,6 +28,11 @@ * Defaults for configuration values can now be callables, which allows dynamic defaults. +* The new ``html-page-context`` event can be used to include custom values + into the context used when rendering an HTML template. + +* Add document metadata to the values in the default template context. + Bugs fixed ---------- Modified: doctools/trunk/doc/conf.py ============================================================================== --- doctools/trunk/doc/conf.py (original) +++ doctools/trunk/doc/conf.py Sat May 31 18:14:36 2008 @@ -162,7 +162,25 @@ return sig +event_sig_re = re.compile(r'([a-zA-Z-]+)\s*\((.*)\)') + +def parse_event(env, sig, signode): + m = event_sig_re.match(sig) + if not m: + signode += addnodes.desc_name(sig, sig) + return sig + name, args = m.groups() + signode += addnodes.desc_name(name, name) + plist = addnodes.desc_parameterlist() + for arg in args.split(','): + arg = arg.strip() + plist += addnodes.desc_parameter(arg, arg) + signode += plist + return name + + def setup(app): app.add_description_unit('directive', 'dir', 'pair: %s; directive', parse_directive) app.add_description_unit('role', 'role', 'pair: %s; role', parse_role) app.add_description_unit('confval', 'confval', 'pair: %s; configuration value') + app.add_description_unit('event', 'event', 'pair: %s; event', parse_event) Modified: doctools/trunk/doc/ext/appapi.rst ============================================================================== --- doctools/trunk/doc/ext/appapi.rst (original) +++ doctools/trunk/doc/ext/appapi.rst Sat May 31 18:14:36 2008 @@ -162,22 +162,43 @@ Sphinx core events ------------------ -These events are known to the core: +These events are known to the core. The arguments showed are given to the +registered event handlers. -.. tabularcolumns:: |l|L|L| +.. event:: builder-inited () + + Emitted the builder object has been created. + +.. event:: doctree-read (doctree) + + Emitted when a doctree has been parsed and read by the environment, and is + about to be pickled. + +.. event:: doctree-resolved (doctree, docname) + + Emitted when a doctree has been "resolved" by the environment, that is, all + references and TOCs have been inserted. + +.. event:: page-context (pagename, templatename, context, doctree) + + Emitted when the HTML builder has created a context dictionary to render a + template with -- this can be used to add custom elements to the context. + + The *pagename* argument is the canonical name of the page being rendered, + that is, without ``.html`` suffix and using slashes as path separators. The + *templatename* is the name of the template to render, this will be + ``'page.html'`` for all pages from reST documents. + + The *context* argument is a dictionary of values that are given to the + template engine to render the page and can be modified to include custom + values. Keys must be strings. + + The *doctree* argument will be a doctree when the page is created from a reST + documents; it will be ``None`` when the page is created from an HTML template + alone. + + .. versionadded:: 0.4 -====================== =================================== ========= -Event name Emitted when Arguments -====================== =================================== ========= -``'builder-inited'`` the builder object has been created -none- -``'doctree-read'`` a doctree has been parsed and read *doctree* - by the environment, and is about to - be pickled -``'doctree-resolved'`` a doctree has been "resolved" by *doctree*, *docname* - the environment, that is, all - references and TOCs have been - inserted -====================== =================================== ========= .. _template-bridge: Modified: doctools/trunk/sphinx/application.py ============================================================================== --- doctools/trunk/sphinx/application.py (original) +++ doctools/trunk/sphinx/application.py Sat May 31 18:14:36 2008 @@ -49,7 +49,8 @@ events = { 'builder-inited': '', 'doctree-read' : 'the doctree before being pickled', - 'doctree-resolved' : 'the doctree, the docname', + 'doctree-resolved' : 'doctree, docname', + 'html-page-context': 'pagename, context, doctree or None', } class Sphinx(object): Modified: doctools/trunk/sphinx/builder.py ============================================================================== --- doctools/trunk/sphinx/builder.py (original) +++ doctools/trunk/sphinx/builder.py Sat May 31 18:14:36 2008 @@ -341,19 +341,13 @@ show_sphinx = self.config.html_show_sphinx, builder = self.name, parents = [], - titles = {}, logo = logo, len = len, # the built-in ) - def write_doc(self, docname, doctree): - destination = StringOutput(encoding='utf-8') - doctree.settings = self.docsettings - - self.imgpath = relative_uri(self.get_target_uri(docname), '_images') - self.docwriter.write(doctree, destination) - self.docwriter.assemble_parts() - + def get_doc_context(self, docname, body): + """Collect items for the template context of a page.""" + # find out relations prev = next = None parents = [] related = self.env.toctree_relations.get(docname) @@ -383,27 +377,40 @@ # "back to index" link already parents.reverse() + # title rendered as HTML title = titles.get(docname) - if title: - title = self.render_partial(title)['title'] - else: - title = '' - self.globalcontext['titles'][docname] = title + title = title and self.render_partial(title)['title'] or '' + # the name for the copied source sourcename = self.config.html_copy_source and docname + '.txt' or '' - ctx = dict( + + # metadata for the document + meta = self.env.metadata.get(docname) + + return dict( + parents = parents, + prev = prev, + next = next, title = title, + meta = meta, + body = body, sourcename = sourcename, - body = self.docwriter.parts['fragment'], toc = self.render_partial(self.env.get_toc_for(docname))['fragment'], # only display a TOC if there's more than one item to show display_toc = (self.env.toc_num_entries[docname] > 1), - parents = parents, - prev = prev, - next = next, ) - self.index_page(docname, doctree, title) - self.handle_page(docname, ctx) + def write_doc(self, docname, doctree): + destination = StringOutput(encoding='utf-8') + doctree.settings = self.docsettings + + self.imgpath = relative_uri(self.get_target_uri(docname), '_images') + self.docwriter.write(doctree, destination) + self.docwriter.assemble_parts() + body = self.docwriter.parts['fragment'] + + ctx = self.get_doc_context(docname, body) + self.index_page(docname, doctree, ctx.get('title', '')) + self.handle_page(docname, ctx, event_arg=doctree) def finish(self): self.info(bold('writing additional files...'), nonl=1) @@ -569,9 +576,10 @@ return docname + self.out_suffix def handle_page(self, pagename, addctx, templatename='page.html', - outfilename=None): + outfilename=None, event_arg=None): ctx = self.globalcontext.copy() - ctx['current_page_name'] = pagename + # current_page_name is backwards compatibility + ctx['pagename'] = ctx['current_page_name'] = pagename def pathto(otheruri, resource=False, baseuri=self.get_target_uri(pagename)): @@ -580,11 +588,11 @@ return relative_uri(baseuri, otheruri) ctx['pathto'] = pathto ctx['hasdoc'] = lambda name: name in self.env.all_docs - sidebarfile = self.config.html_sidebars.get(pagename) - if sidebarfile: - ctx['customsidebar'] = sidebarfile + ctx['customsidebar'] = self.config.html_sidebars.get(pagename) ctx.update(addctx) + self.app.emit('html-page-context', pagename, templatename, ctx, event_arg) + output = self.templates.render(templatename, ctx) if not outfilename: outfilename = path.join(self.outdir, os_path(pagename) + self.out_suffix) Modified: doctools/trunk/sphinx/templates/layout.html ============================================================================== --- doctools/trunk/sphinx/templates/layout.html (original) +++ doctools/trunk/sphinx/templates/layout.html Sat May 31 18:14:36 2008 @@ -75,7 +75,7 @@ {{ rendertemplate(customsidebar) }} {%- endif %} {%- block sidebarsearch %} - {%- if current_page_name != "search" %} + {%- if pagename != "search" %} <h3>{{ builder == 'web' and 'Keyword' or 'Quick' }} search</h3> <form class="search" action="{{ pathto('search') }}" method="get"> <input type="text" name="q" size="18" /> <input type="submit" value="Go" /> Modified: doctools/trunk/sphinx/templates/web/settings.html ============================================================================== --- doctools/trunk/sphinx/templates/web/settings.html (original) +++ doctools/trunk/sphinx/templates/web/settings.html Sat May 31 18:14:36 2008 @@ -1,6 +1,6 @@ {% extends "layout.html" %} {% set title = 'Settings' %} -{% set current_page_name = 'settings' %} +{% set pagename = 'settings' %} {% block body %} <h1>{{ project }} Documentation Settings</h1> <p>

1 0

r63832 - doctools/trunk/CHANGES
by georg.brandl May 31, 2008

May 31, 2008

Author: georg.brandl Date: Sat May 31 17:45:09 2008 New Revision: 63832 Log: Oops. Modified: doctools/trunk/CHANGES Modified: doctools/trunk/CHANGES ============================================================================== --- doctools/trunk/CHANGES (original) +++ doctools/trunk/CHANGES Sat May 31 17:45:09 2008 @@ -1,4 +1,4 @@ -MaOChanges in trunk +Changes in trunk ================ New features added

1 0

r63831 - python/trunk/Doc/library/easydialogs.rst
by georg.brandl May 31, 2008

May 31, 2008

Author: georg.brandl Date: Sat May 31 16:45:55 2008 New Revision: 63831 Log: #3005: add explaining sentence to easydialogs docs. Modified: python/trunk/Doc/library/easydialogs.rst Modified: python/trunk/Doc/library/easydialogs.rst ============================================================================== --- python/trunk/Doc/library/easydialogs.rst (original) +++ python/trunk/Doc/library/easydialogs.rst Sat May 31 16:45:55 2008 @@ -9,10 +9,12 @@ The :mod:`EasyDialogs` module contains some simple dialogs for the Macintosh. -All routines take an optional resource ID parameter *id* with which one can -override the :const:`DLOG` resource used for the dialog, provided that the -dialog items correspond (both type and item number) to those in the default -:const:`DLOG` resource. See source code for details. +The dialogs get launched in a separate application which appears in the dock and +must be clicked on for the dialogs be displayed. All routines take an optional +resource ID parameter *id* with which one can override the :const:`DLOG` +resource used for the dialog, provided that the dialog items correspond (both +type and item number) to those in the default :const:`DLOG` resource. See source +code for details. .. warning::

1 0

r63830 - python/trunk/Doc/library/cmd.rst
by georg.brandl May 31, 2008

May 31, 2008

Author: georg.brandl Date: Sat May 31 16:40:09 2008 New Revision: 63830 Log: #3010: clarification about stdin/use_rawinput. Modified: python/trunk/Doc/library/cmd.rst Modified: python/trunk/Doc/library/cmd.rst ============================================================================== --- python/trunk/Doc/library/cmd.rst (original) +++ python/trunk/Doc/library/cmd.rst Sat May 31 16:40:09 2008 @@ -26,7 +26,12 @@ The optional arguments *stdin* and *stdout* specify the input and output file objects that the Cmd instance or subclass instance will use for input and - output. If not specified, they will default to *sys.stdin* and *sys.stdout*. + output. If not specified, they will default to :data:`sys.stdin` and + :data:`sys.stdout`. + + If you want a given *stdin* to be used, make sure to set the instance's + :attr:`use_rawinput` attribute to ``False``, otherwise *stdin* will be + ignored. .. versionchanged:: 2.3 The *stdin* and *stdout* parameters were added.

1 0

r63829 - in python: branches/py3k/Doc/library/re.rst trunk/Doc/library/re.rst
by mark.summerfield May 31, 2008

May 31, 2008

Author: mark.summerfield Date: Sat May 31 15:05:34 2008 New Revision: 63829 Log: Added a note to [] that special forms & special chars lose their meaning and backrefs can't be used inside [] Modified: python/trunk/Doc/library/re.rst Changes in other areas also in this revision: Modified: python/branches/py3k/Doc/library/re.rst Modified: python/trunk/Doc/library/re.rst ============================================================================== --- python/trunk/Doc/library/re.rst (original) +++ python/trunk/Doc/library/re.rst Sat May 31 15:05:34 2008 @@ -181,6 +181,12 @@ ``[^5]`` will match any character except ``'5'``, and ``[^^]`` will match any character except ``'^'``. + Note that inside ``[]`` the special forms and special characters lose + their meanings and only the syntaxes described here are valid. For + example, ``+``, ``*``, ``(``, ``)``, and so on are treated as + literals inside ``[]``, and backreferences cannot be used inside + ``[]``. + ``'|'`` ``A|B``, where A and B can be arbitrary REs, creates a regular expression that will match either A or B. An arbitrary number of REs can be separated by the Diffs of changes in other areas also in this revision: Modified: python/branches/py3k/Doc/library/re.rst ============================================================================== --- python/branches/py3k/Doc/library/re.rst (original) +++ python/branches/py3k/Doc/library/re.rst Sat May 31 15:05:34 2008 @@ -181,6 +181,12 @@ ``[^5]`` will match any character except ``'5'``, and ``[^^]`` will match any character except ``'^'``. + Note that inside ``[]`` the special forms and special characters lose + their meanings and only the syntaxes described here are valid. For + example, ``+``, ``*``, ``(``, ``)``, and so on are treated as + literals inside ``[]``, and backreferences cannot be used inside + ``[]``. + ``'|'`` ``A|B``, where A and B can be arbitrary REs, creates a regular expression that will match either A or B. An arbitrary number of REs can be separated by the

1 0

r63828 - in python/trunk: Lib/distutils/command/wininst-6.0.exe Lib/distutils/command/wininst-7.1.exe Lib/distutils/command/wininst-9.0-amd64.exe Lib/distutils/command/wininst-9.0.exe PC/bdist_wininst/install.c
by mark.hammond May 31, 2008

May 31, 2008

Author: mark.hammond Date: Sat May 31 07:11:07 2008 New Revision: 63828 Log: Fix bdist_wininst --user-access-control for win2k Modified: python/trunk/Lib/distutils/command/wininst-6.0.exe python/trunk/Lib/distutils/command/wininst-7.1.exe python/trunk/Lib/distutils/command/wininst-9.0-amd64.exe python/trunk/Lib/distutils/command/wininst-9.0.exe python/trunk/PC/bdist_wininst/install.c Modified: python/trunk/Lib/distutils/command/wininst-6.0.exe ============================================================================== Binary files. No diff available. Modified: python/trunk/Lib/distutils/command/wininst-7.1.exe ============================================================================== Binary files. No diff available. Modified: python/trunk/Lib/distutils/command/wininst-9.0-amd64.exe ============================================================================== Binary files. No diff available. Modified: python/trunk/Lib/distutils/command/wininst-9.0.exe ============================================================================== Binary files. No diff available. Modified: python/trunk/PC/bdist_wininst/install.c ============================================================================== --- python/trunk/PC/bdist_wininst/install.c (original) +++ python/trunk/PC/bdist_wininst/install.c Sat May 31 07:11:07 2008 @@ -2115,11 +2115,6 @@ { HKEY hk; char key_name[80]; - OSVERSIONINFO winverinfo; - winverinfo.dwOSVersionInfoSize = sizeof(winverinfo); - // If less than XP, then we can't do it (and its not necessary). - if (!GetVersionEx(&winverinfo) || winverinfo.dwMajorVersion < 5) - return FALSE; // no Python version info == we can't know yet. if (target_version[0] == '\0') return FALSE; @@ -2135,6 +2130,23 @@ return TRUE; } +// Returns TRUE if the platform supports UAC. +BOOL PlatformSupportsUAC() +{ + // Note that win2k does seem to support ShellExecute with 'runas', + // but does *not* support IsUserAnAdmin - so we just pretend things + // only work on XP and later. + BOOL bIsWindowsXPorLater; + OSVERSIONINFO winverinfo; + winverinfo.dwOSVersionInfoSize = sizeof(winverinfo); + if (!GetVersionEx(&winverinfo)) + return FALSE; // something bad has gone wrong + bIsWindowsXPorLater = + ( (winverinfo.dwMajorVersion > 5) || + ( (winverinfo.dwMajorVersion == 5) && (winverinfo.dwMinorVersion >= 1) )); + return bIsWindowsXPorLater; +} + // Spawn ourself as an elevated application. On failure, a message is // displayed to the user - but this app will always terminate, even // on error. @@ -2190,7 +2202,7 @@ // See if we need to do the Vista UAC magic. if (strcmp(user_access_control, "force")==0) { - if (!MyIsUserAnAdmin()) { + if (PlatformSupportsUAC() && !MyIsUserAnAdmin()) { SpawnUAC(); return 0; } @@ -2198,7 +2210,7 @@ } else if (strcmp(user_access_control, "auto")==0) { // Check if it looks like we need UAC control, based // on how Python itself was installed. - if (!MyIsUserAnAdmin() && NeedAutoUAC()) { + if (PlatformSupportsUAC() && !MyIsUserAnAdmin() && NeedAutoUAC()) { SpawnUAC(); return 0; }

1 0

buildbot failure in sparc Debian 3.0
by buildbot＠python.org May 31, 2008

May 31, 2008

The Buildbot has detected a new failure of sparc Debian 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20Debian%203.0/builds/284 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-sparc Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: benjamin.peterson BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_urllibnet make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

r63827 - in python/trunk: Lib/heapq.py Misc/NEWS Modules/_heapqmodule.c
by raymond.hettinger May 31, 2008

May 31, 2008

Author: raymond.hettinger Date: Sat May 31 05:24:31 2008 New Revision: 63827 Log: Implement heapq in terms of less-than (to match list.sort()). Modified: python/trunk/Lib/heapq.py python/trunk/Misc/NEWS python/trunk/Modules/_heapqmodule.c Modified: python/trunk/Lib/heapq.py ============================================================================== --- python/trunk/Lib/heapq.py (original) +++ python/trunk/Lib/heapq.py Sat May 31 05:24:31 2008 @@ -167,7 +167,7 @@ def heappushpop(heap, item): """Fast version of a heappush followed by a heappop.""" - if heap and item > heap[0]: + if heap and heap[0] < item: item, heap[0] = heap[0], item _siftup(heap, 0) return item @@ -240,10 +240,11 @@ while pos > startpos: parentpos = (pos - 1) >> 1 parent = heap[parentpos] - if parent <= newitem: - break - heap[pos] = parent - pos = parentpos + if newitem < parent: + heap[pos] = parent + pos = parentpos + continue + break heap[pos] = newitem # The child indices of heap index pos are already heaps, and we want to make @@ -294,7 +295,7 @@ while childpos < endpos: # Set childpos to index of smaller child. rightpos = childpos + 1 - if rightpos < endpos and heap[rightpos] <= heap[childpos]: + if rightpos < endpos and not heap[childpos] < heap[rightpos]: childpos = rightpos # Move the smaller child up. heap[pos] = heap[childpos] Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sat May 31 05:24:31 2008 @@ -36,6 +36,9 @@ Extension Modules ----------------- +- The heapq module does comparisons using LT instead of LE. This + makes its implementation match that used by list.sort(). + - Issue #2819: add full-precision summation function to math module, based on Hettinger's ASPN Python Cookbook recipe. Modified: python/trunk/Modules/_heapqmodule.c ============================================================================== --- python/trunk/Modules/_heapqmodule.c (original) +++ python/trunk/Modules/_heapqmodule.c Sat May 31 05:24:31 2008 @@ -28,12 +28,12 @@ while (pos > startpos){ parentpos = (pos - 1) >> 1; parent = PyList_GET_ITEM(heap, parentpos); - cmp = PyObject_RichCompareBool(parent, newitem, Py_LE); + cmp = PyObject_RichCompareBool(newitem, parent, Py_LT); if (cmp == -1) { Py_DECREF(newitem); return -1; } - if (cmp == 1) + if (cmp == 0) break; Py_INCREF(parent); Py_DECREF(PyList_GET_ITEM(heap, pos)); @@ -69,14 +69,14 @@ rightpos = childpos + 1; if (rightpos < endpos) { cmp = PyObject_RichCompareBool( - PyList_GET_ITEM(heap, rightpos), PyList_GET_ITEM(heap, childpos), - Py_LE); + PyList_GET_ITEM(heap, rightpos), + Py_LT); if (cmp == -1) { Py_DECREF(newitem); return -1; } - if (cmp == 1) + if (cmp == 0) childpos = rightpos; } /* Move the smaller child up. */ @@ -214,10 +214,10 @@ return item; } - cmp = PyObject_RichCompareBool(item, PyList_GET_ITEM(heap, 0), Py_LE); + cmp = PyObject_RichCompareBool(PyList_GET_ITEM(heap, 0), item, Py_LT); if (cmp == -1) return NULL; - if (cmp == 1) { + if (cmp == 0) { Py_INCREF(item); return item; } @@ -270,6 +270,7 @@ { PyObject *heap=NULL, *elem, *iterable, *sol, *it, *oldelem; Py_ssize_t i, n; + int cmp; if (!PyArg_ParseTuple(args, "nO:nlargest", &n, &iterable)) return NULL; @@ -312,7 +313,12 @@ else goto sortit; } - if (PyObject_RichCompareBool(elem, sol, Py_LE)) { + cmp = PyObject_RichCompareBool(sol, elem, Py_LT); + if (cmp == -1) { + Py_DECREF(elem); + goto fail; + } + if (cmp == 0) { Py_DECREF(elem); continue; } @@ -362,12 +368,12 @@ while (pos > startpos){ parentpos = (pos - 1) >> 1; parent = PyList_GET_ITEM(heap, parentpos); - cmp = PyObject_RichCompareBool(newitem, parent, Py_LE); + cmp = PyObject_RichCompareBool(parent, newitem, Py_LT); if (cmp == -1) { Py_DECREF(newitem); return -1; } - if (cmp == 1) + if (cmp == 0) break; Py_INCREF(parent); Py_DECREF(PyList_GET_ITEM(heap, pos)); @@ -403,14 +409,14 @@ rightpos = childpos + 1; if (rightpos < endpos) { cmp = PyObject_RichCompareBool( - PyList_GET_ITEM(heap, childpos), PyList_GET_ITEM(heap, rightpos), - Py_LE); + PyList_GET_ITEM(heap, childpos), + Py_LT); if (cmp == -1) { Py_DECREF(newitem); return -1; } - if (cmp == 1) + if (cmp == 0) childpos = rightpos; } /* Move the smaller child up. */ @@ -434,6 +440,7 @@ { PyObject *heap=NULL, *elem, *iterable, *los, *it, *oldelem; Py_ssize_t i, n; + int cmp; if (!PyArg_ParseTuple(args, "nO:nsmallest", &n, &iterable)) return NULL; @@ -477,7 +484,12 @@ else goto sortit; } - if (PyObject_RichCompareBool(los, elem, Py_LE)) { + cmp = PyObject_RichCompareBool(elem, los, Py_LT); + if (cmp == -1) { + Py_DECREF(elem); + goto fail; + } + if (cmp == 0) { Py_DECREF(elem); continue; }

1 0