Merged revisions 73286,73294,73296,73459,73462-73463,73544,73576-73577,73595-73596,73693-73694,73704-73705,73707,73713,73937-73940,73945,73951,73979 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73286 | georg.brandl | 2009-06-08 09:57:35 +0200 (Mo, 08 Jun 2009) | 1 line

  Remove period from end of headings.
........
  r73294 | georg.brandl | 2009-06-08 15:34:52 +0200 (Mo, 08 Jun 2009) | 1 line

  #6194: O_SHLOCK/O_EXLOCK are not really more platform independent than lockf().
........
  r73296 | georg.brandl | 2009-06-08 18:03:41 +0200 (Mo, 08 Jun 2009) | 1 line

  #6238: add fillchar to string.just function family.
........
  r73459 | raymond.hettinger | 2009-06-17 03:43:47 +0200 (Mi, 17 Jun 2009) | 1 line

  Add usage note.
........
  r73462 | georg.brandl | 2009-06-17 11:36:21 +0200 (Mi, 17 Jun 2009) | 1 line

  #6295: clarify blocking behavior of getch().
........
  r73463 | georg.brandl | 2009-06-17 11:43:31 +0200 (Mi, 17 Jun 2009) | 1 line

  #6255: document PyInt_FromSize_t.
........
  r73544 | georg.brandl | 2009-06-24 08:41:19 +0200 (Mi, 24 Jun 2009) | 1 line

  #6332: fix word dupes throughout the source.
........
  r73576 | benjamin.peterson | 2009-06-27 01:37:06 +0200 (Sa, 27 Jun 2009) | 1 line

  document is_declared_global()
........
  r73577 | benjamin.peterson | 2009-06-27 16:16:23 +0200 (Sa, 27 Jun 2009) | 1 line

  link to extensive generator docs in the reference manual
........
  r73595 | ezio.melotti | 2009-06-28 01:45:39 +0200 (So, 28 Jun 2009) | 1 line

  stmt and setup can contain multiple statements, see #5896
........
  r73596 | ezio.melotti | 2009-06-28 02:07:45 +0200 (So, 28 Jun 2009) | 1 line

  Fixed a wrong apostrophe
........
  r73693 | jesse.noller | 2009-06-29 20:20:34 +0200 (Mo, 29 Jun 2009) | 1 line

  Bug 5906: add a documentation note for unix daemons vs. multiprocessing daemons
........
  r73694 | jesse.noller | 2009-06-29 20:24:26 +0200 (Mo, 29 Jun 2009) | 1 line

  Issue 5740: multiprocessing.connection.* authkey fixes
........
  r73704 | georg.brandl | 2009-06-30 18:15:43 +0200 (Di, 30 Jun 2009) | 1 line

  #6376: fix copy-n-paste oversight.
........
  r73705 | georg.brandl | 2009-06-30 18:17:28 +0200 (Di, 30 Jun 2009) | 1 line

  #6374: add a bit of explanation about shell=True on Windows.
........
  r73707 | georg.brandl | 2009-06-30 18:35:11 +0200 (Di, 30 Jun 2009) | 1 line

  #6371: fix link targets.
........
  r73713 | ezio.melotti | 2009-07-01 00:56:16 +0200 (Mi, 01 Jul 2009) | 1 line

  Fixed a backslash that was not supposed to be there
........
  r73937 | georg.brandl | 2009-07-11 12:12:36 +0200 (Sa, 11 Jul 2009) | 1 line

  Fix style.
........
  r73938 | georg.brandl | 2009-07-11 12:14:54 +0200 (Sa, 11 Jul 2009) | 1 line

  #6446: fix import_spam() function to use correct error and reference handling.
........
  r73939 | georg.brandl | 2009-07-11 12:18:10 +0200 (Sa, 11 Jul 2009) | 1 line

  #6448: clarify docs for find_module().
........
  r73940 | georg.brandl | 2009-07-11 12:37:38 +0200 (Sa, 11 Jul 2009) | 1 line

  #6430: add note about size of "u" type.
........
  r73945 | georg.brandl | 2009-07-11 12:51:31 +0200 (Sa, 11 Jul 2009) | 1 line

  #6456: clarify the meaning of constants used as arguments to nl_langinfo().
........
  r73951 | georg.brandl | 2009-07-11 16:23:38 +0200 (Sa, 11 Jul 2009) | 2 lines

  array.array is actually a class.
........
  r73979 | benjamin.peterson | 2009-07-12 18:56:54 +0200 (So, 12 Jul 2009) | 1 line

  add versionadded
........

Blocked revisions 72570,72616,72786,72813,72879-72880,72890,72905,72912,72956,73002,73027,73029,73049,73060,73068,73071-73072,73272 via svnmerge

........
  r72570 | michael.foord | 2009-05-11 19:59:43 +0200 (Mo, 11 Mai 2009) | 7 lines

  Adds a verbosity keyword argument to unittest.main plus a minor fix allowing you to specify test modules / classes
  from the command line.

  Closes issue 5995.

  Michael Foord
........
  r72616 | benjamin.peterson | 2009-05-14 02:33:10 +0200 (Do, 14 Mai 2009) | 1 line

  importlib.import_module is better these days
........
  r72786 | raymond.hettinger | 2009-05-19 19:43:59 +0200 (Di, 19 Mai 2009) | 1 line

  Note that ordered dictionaries work with reversed().
........
  r72813 | raymond.hettinger | 2009-05-22 03:06:44 +0200 (Fr, 22 Mai 2009) | 1 line

  Fix-up moving average example.
........
  r72879 | jeffrey.yasskin | 2009-05-24 01:23:01 +0200 (So, 24 Mai 2009) | 14 lines

  Issue #6042:
  lnotab-based tracing is very complicated and isn't documented very well.  There
  were at least 3 comment blocks purporting to document co_lnotab, and none did a
  very good job. This patch unifies them into Objects/lnotab_notes.txt which
  tries to completely capture the current state of affairs.

  I also discovered that we've attached 2 layers of patches to the basic tracing
  scheme. The first layer avoids jumping to instructions that don't start a line,
  to avoid problems in if statements and while loops.  The second layer
  discovered that jumps backward do need to trace at instructions that don't
  start a line, so it added extra lnotab entries for 'while' and 'for' loops, and
  added a special case for backward jumps within the same line. I replaced these
  patches by just treating forward and backward jumps differently.
........
  r72880 | senthil.kumaran | 2009-05-24 11:14:50 +0200 (So, 24 Mai 2009) | 3 lines

  Fixed Issue1424152, urllib2 fails with HTTPS over Proxy.
........
  r72890 | gregory.p.smith | 2009-05-24 20:00:13 +0200 (So, 24 Mai 2009) | 2 lines

  add a versionadded tag for set_tunnel
........
  r72905 | benjamin.peterson | 2009-05-25 02:48:58 +0200 (Mo, 25 Mai 2009) | 4 lines

  make class skipping decorators the same as skipping every test of the class

  This removes ClassTestSuite and a good bit of hacks.
........
  r72912 | benjamin.peterson | 2009-05-25 15:13:44 +0200 (Mo, 25 Mai 2009) | 5 lines

  add a SETUP_WITH opcode

  It speeds up the with statement and correctly looks up the special
  methods involved.
........
  r72956 | raymond.hettinger | 2009-05-27 04:24:45 +0200 (Mi, 27 Mai 2009) | 3 lines

  Fix field name conflicts for named tuples.
........
  r73002 | raymond.hettinger | 2009-05-29 03:46:48 +0200 (Fr, 29 Mai 2009) | 3 lines

  Deprecate contextlib.nested().  The with-statement now provides this functionality directly.
........
  r73027 | michael.foord | 2009-05-29 22:33:46 +0200 (Fr, 29 Mai 2009) | 1 line

  Add test discovery to unittest. Issue 6001.
........
  r73029 | raymond.hettinger | 2009-05-29 23:20:41 +0200 (Fr, 29 Mai 2009) | 1 line

  Move the basic examples section back to the beginning.
........
  r73049 | georg.brandl | 2009-05-30 12:45:40 +0200 (Sa, 30 Mai 2009) | 1 line

  Rewrap a few long lines.
........
  r73060 | gregory.p.smith | 2009-05-30 21:58:11 +0200 (Sa, 30 Mai 2009) | 2 lines

  Add more examples to the ipaddr documentation.
........
  r73068 | antoine.pitrou | 2009-05-30 23:45:40 +0200 (Sa, 30 Mai 2009) | 3 lines

  Update ACKS
........
  r73071 | georg.brandl | 2009-05-31 16:15:25 +0200 (So, 31 Mai 2009) | 1 line

  Fix markup.
........
  r73072 | antoine.pitrou | 2009-05-31 16:20:14 +0200 (So, 31 Mai 2009) | 4 lines

  Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running
  regression tests in parallel, shortening the total runtime.
........
  r73272 | kristjan.jonsson | 2009-06-07 18:43:23 +0200 (So, 07 Jun 2009) | 2 lines

  http://bugs.python.org/issue6192
  Add a feature to disable the Nagle algorithm on sockets in TCPServer
........

Merged revisions 72558,72745,72750,72876,73042,73045-73048,73069,73089,73163,73186,73213,73215,73217,73257-73258,73260 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72558 | benjamin.peterson | 2009-05-11 01:52:09 +0200 (Mo, 11 Mai 2009) | 1 line

  sys.setdefaultencoding() strikes me as a bad example
........
  r72745 | benjamin.peterson | 2009-05-17 16:16:29 +0200 (So, 17 Mai 2009) | 1 line

  ignore .rst files in sphinx its self
........
  r72750 | benjamin.peterson | 2009-05-17 18:59:27 +0200 (So, 17 Mai 2009) | 1 line

  chop off slash
........
  r72876 | benjamin.peterson | 2009-05-23 22:59:09 +0200 (Sa, 23 Mai 2009) | 1 line

  remove mention of old ctypes version
........
  r73042 | benjamin.peterson | 2009-05-30 05:10:52 +0200 (Sa, 30 Mai 2009) | 1 line

  no fdatasync on macos
........
  r73045 | georg.brandl | 2009-05-30 09:26:04 +0200 (Sa, 30 Mai 2009) | 1 line

  #6146: fix markup bug.
........
  r73046 | georg.brandl | 2009-05-30 09:31:25 +0200 (Sa, 30 Mai 2009) | 1 line

  Use preferred form of raising exceptions.
........
  r73047 | georg.brandl | 2009-05-30 12:33:23 +0200 (Sa, 30 Mai 2009) | 1 line

  Fix some more small markup problems.
........
  r73048 | georg.brandl | 2009-05-30 12:34:25 +0200 (Sa, 30 Mai 2009) | 1 line

  Fix markup problem.
........
  r73069 | benjamin.peterson | 2009-05-31 02:42:42 +0200 (So, 31 Mai 2009) | 1 line

  fix signature
........
  r73089 | andrew.kuchling | 2009-06-01 02:14:19 +0200 (Mo, 01 Jun 2009) | 1 line

  The class for regexes isn't called RegexObject any more; correct the text
........
  r73163 | georg.brandl | 2009-06-03 09:25:35 +0200 (Mi, 03 Jun 2009) | 1 line

  Use the preferred form of raise statements in the docs.
........
  r73186 | georg.brandl | 2009-06-03 23:21:09 +0200 (Mi, 03 Jun 2009) | 1 line

  #6174: fix indentation in code example.
........
  r73213 | georg.brandl | 2009-06-04 12:15:57 +0200 (Do, 04 Jun 2009) | 1 line

  #5967: note that the C slicing APIs do not support negative indices.
........
  r73215 | georg.brandl | 2009-06-04 12:22:31 +0200 (Do, 04 Jun 2009) | 1 line

  #6176: fix man page section for flock(2).
........
  r73217 | georg.brandl | 2009-06-04 12:27:21 +0200 (Do, 04 Jun 2009) | 1 line

  #6175: document that inet_aton supports alternate input formats with less than three dots.
........
  r73257 | georg.brandl | 2009-06-06 19:50:05 +0200 (Sa, 06 Jun 2009) | 1 line

  #6211: elaborate a bit on ways to call the function.
........
  r73258 | georg.brandl | 2009-06-06 19:51:31 +0200 (Sa, 06 Jun 2009) | 1 line

  #6204: use a real reference instead of "see later".
........
  r73260 | georg.brandl | 2009-06-06 20:21:58 +0200 (Sa, 06 Jun 2009) | 1 line

  #6224: s/JPython/Jython/, and remove one link to a module nine years old.
........

Blocked revisions 71119,71263,71406,71419,71430,71435,71448,71771,72173,72191,72198,72219,72225,72267,72487-72489,72494 via svnmerge

................
  r71119 | raymond.hettinger | 2009-04-04 07:37:47 +0200 (Sa, 04 Apr 2009) | 1 line

  Add helpful link.
................
  r71263 | michael.foord | 2009-04-05 21:19:28 +0200 (So, 05 Apr 2009) | 4 lines

  Adding assertIs and assertIsNot methods to unittest.TestCase

  Issue #2578
................
  r71406 | andrew.kuchling | 2009-04-09 13:23:36 +0200 (Do, 09 Apr 2009) | 1 line

  Typo fixes
................
  r71419 | raymond.hettinger | 2009-04-10 00:31:51 +0200 (Fr, 10 Apr 2009) | 1 line

  Add note on using keyword arguments with OrderedDict.
................
  r71430 | raymond.hettinger | 2009-04-10 06:25:45 +0200 (Fr, 10 Apr 2009) | 1 line

  Clarify the table entries for combinatorics.
................
  r71435 | raymond.hettinger | 2009-04-10 08:38:39 +0200 (Fr, 10 Apr 2009) | 1 line

  Fix the count of datatypes.
................
  r71448 | raymond.hettinger | 2009-04-10 15:16:50 +0200 (Fr, 10 Apr 2009) | 1 line

  Add examples.
................
  r71771 | raymond.hettinger | 2009-04-20 20:23:57 +0200 (Mo, 20 Apr 2009) | 1 line

  Fix typo
................
  r72173 | gregory.p.smith | 2009-05-01 21:59:52 +0200 (Fr, 01 Mai 2009) | 5 lines

  Adds the ipaddr module to the standard library.  Issue #3959.
  Based off of subversion r69 from http://code.google.com/p/ipaddr-py/

  This code is 2to3 safe, I'll merge it into py3k later this afternoon.
................
  r72191 | michael.foord | 2009-05-02 13:43:06 +0200 (Sa, 02 Mai 2009) | 9 lines

  Adds an exit parameter to unittest.main(). If False main no longer
  calls sys.exit.

  Closes issue 3379.

  Michael Foord

................
  r72198 | andrew.kuchling | 2009-05-02 19:12:15 +0200 (Sa, 02 Mai 2009) | 1 line

  Add items
................
  r72219 | michael.foord | 2009-05-02 22:15:05 +0200 (Sa, 02 Mai 2009) | 8 lines

  Add addCleanup and doCleanups to unittest.TestCase.

  Closes issue 5679.

  Michael Foord
................
  r72225 | michael.foord | 2009-05-03 00:43:34 +0200 (So, 03 Mai 2009) | 1 line
................
  r72267 | gregory.p.smith | 2009-05-04 02:16:49 +0200 (Mo, 04 Mai 2009) | 3 lines

  Issue #4751: For hashlib algorithms provided by OpenSSL, the Python
  GIL is now released during computation on data lengths >= 2048 bytes.
................
  r72487 | jeffrey.yasskin | 2009-05-08 23:51:06 +0200 (Fr, 08 Mai 2009) | 7 lines

  PyCode_NewEmpty:
  Most uses of PyCode_New found by http://www.google.com/codesearch?q=PyCode_New
  are trying to build an empty code object, usually to put it in a dummy frame
  object. This patch adds a PyCode_NewEmpty wrapper which lets the user specify
  just the filename, function name, and first line number, instead of also
  requiring lots of code internals.
................
  r72488 | jeffrey.yasskin | 2009-05-09 00:23:21 +0200 (Sa, 09 Mai 2009) | 13 lines

  Issue 5954, PyFrame_GetLineNumber:
  Most uses of PyCode_Addr2Line
  (http://www.google.com/codesearch?q=PyCode_Addr2Line) are just trying to get
  the line number of a specified frame, but there's no way to do that directly.
  Forcing people to go through the code object makes them know more about the
  guts of the interpreter than they should need.

  The remaining uses of PyCode_Addr2Line seem to be getting the line from a
  traceback (for example,
  http://www.google.com/codesearch/p?hl=en#u_9_nDrchrw/pygame-1.7.1release/src/base.c&q=PyCode_Addr2Line),
  which is replaced by the tb_lineno field.  So we may be able to deprecate
  PyCode_Addr2Line entirely for external use.
................
  r72489 | gregory.p.smith | 2009-05-09 01:16:47 +0200 (Sa, 09 Mai 2009) | 3 lines

  Fix an off by one error on negative indexs to __getitem__
  http://code.google.com/p/ipaddr-py/issues/detail?id=15
................
  r72494 | benjamin.peterson | 2009-05-09 03:01:14 +0200 (Sa, 09 Mai 2009) | 21 lines

  Merged revisions 72491-72493 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r72491 | benjamin.peterson | 2009-05-08 19:33:27 -0500 (Fri, 08 May 2009) | 7 lines

    make 2to3 use unicode internally on 2.x

    This started out as a fix for #2660, but became this large refactoring
    when I realized the dire state this was in. 2to3 now uses
    tokenize.detect_encoding to decode the files correctly into unicode.
  ........
    r72492 | benjamin.peterson | 2009-05-08 19:35:38 -0500 (Fri, 08 May 2009) | 1 line

    remove compat code
  ........
    r72493 | benjamin.peterson | 2009-05-08 19:54:15 -0500 (Fri, 08 May 2009) | 1 line

    add a test for \r\n newlines
  ........
................

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71094 | vinay.sajip | 2009-04-03 12:23:18 +0200 (Fr, 03 Apr 2009) | 1 line

  Added warning about logging use from asynchronous signal handlers.
........
  r71102 | andrew.kuchling | 2009-04-03 23:44:49 +0200 (Fr, 03 Apr 2009) | 1 line

  Fix 'the the'; grammar fix
........
  r71103 | andrew.kuchling | 2009-04-03 23:45:29 +0200 (Fr, 03 Apr 2009) | 1 line

  Fix 'the the' duplication
........
  r71106 | vinay.sajip | 2009-04-03 23:58:16 +0200 (Fr, 03 Apr 2009) | 1 line

  Clarified warning about logging use from asynchronous signal handlers.
........
  r71486 | andrew.kuchling | 2009-04-11 18:18:14 +0200 (Sa, 11 Apr 2009) | 1 line

  Re-word
........
  r71962 | eric.smith | 2009-04-26 12:05:11 +0200 (So, 26 Apr 2009) | 1 line

  Note that the caller is resposible for freeing the result of PyOS_double_to_string.
........
  r72053 | raymond.hettinger | 2009-04-27 23:12:54 +0200 (Mo, 27 Apr 2009) | 1 line

  Add example to the seealso section.
........
  r72221 | benjamin.peterson | 2009-05-02 22:26:53 +0200 (Sa, 02 Mai 2009) | 1 line

  add myself
........
  r72418 | r.david.murray | 2009-05-07 03:39:25 +0200 (Do, 07 Mai 2009) | 3 lines

  Document how to pass a 'decode' argument to get_payload when
  is_multipart is False.
........
  r72419 | r.david.murray | 2009-05-07 03:43:57 +0200 (Do, 07 Mai 2009) | 2 lines

  Revert inappropriate doc change.
........

Blocked revisions 70598,70605,70616,70668-70669,70671,70771-70772,70837,70878,70918,70939,70986,71031-71032,71036,71070,71075 via svnmerge

........
  r70598 | benjamin.peterson | 2009-03-25 22:24:04 +0100 (Mi, 25 Mär 2009) | 1 line

  add shorthands for expected failures and unexpected success
........
  r70605 | benjamin.peterson | 2009-03-26 17:32:23 +0100 (Do, 26 Mär 2009) | 1 line

  remove uneeded function
........
  r70616 | benjamin.peterson | 2009-03-26 21:05:50 +0100 (Do, 26 Mär 2009) | 1 line

  rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
  r70668 | benjamin.peterson | 2009-03-29 05:16:57 +0200 (So, 29 Mär 2009) | 1 line

  a more realistic example
........
  r70669 | benjamin.peterson | 2009-03-29 05:31:40 +0200 (So, 29 Mär 2009) | 1 line

  stop the versionchanged directive from hiding the docs
........
  r70671 | benjamin.peterson | 2009-03-29 05:39:58 +0200 (So, 29 Mär 2009) | 1 line

  fix consistency
........
  r70771 | andrew.kuchling | 2009-03-31 00:31:11 +0200 (Di, 31 Mär 2009) | 1 line

  Many edits
........
  r70772 | barry.warsaw | 2009-03-31 00:42:17 +0200 (Di, 31 Mär 2009) | 5 lines

  A fix for issue 1974, inspired by the patch from Andi Albrecht (aalbrecht),
  though with some changes by me.  This patch should not be back ported or
  forward ported.  It's a bit too risky for 2.6 and 3.x does things fairly
  differently.
........
  r70837 | gregory.p.smith | 2009-03-31 18:54:10 +0200 (Di, 31 Mär 2009) | 9 lines

  The unittest.TestCase.assertEqual() now displays the differences in lists,
  tuples, dicts and sets on failure.

  Many new handy type and comparison specific assert* methods have been added
  that fail with error messages actually useful for debugging.  Contributed in
  by Google and completed with help from mfoord and GvR at PyCon 2009 sprints.

  Discussion lives in http://bugs.python.org/issue2578.
........
  r70878 | gregory.p.smith | 2009-03-31 21:59:14 +0200 (Di, 31 Mär 2009) | 3 lines

  Issue an actual PendingDeprecationWarning for the TestCase.fail* methods.
  Document the deprecation.
........
  r70918 | raymond.hettinger | 2009-04-01 00:43:03 +0200 (Mi, 01 Apr 2009) | 1 line

  Improve examples for collections.deque()
........
  r70939 | jesse.noller | 2009-04-01 05:45:50 +0200 (Mi, 01 Apr 2009) | 1 line

  Fix multiprocessing.event to match the new threading.Event API
........
  r70986 | raymond.hettinger | 2009-04-01 22:50:58 +0200 (Mi, 01 Apr 2009) | 1 line

  Add link to an alternative generator with a long-period.
........
  r71031 | brett.cannon | 2009-04-02 05:17:39 +0200 (Do, 02 Apr 2009) | 6 lines

  PyImport_AppendInittab() took a char * as a first argument even though that
  string was stored beyond the life of the call. Changed the signature to be
  const char * to help make this point.

  Closes issue #1419652.
........
  r71032 | michael.foord | 2009-04-02 05:20:38 +0200 (Do, 02 Apr 2009) | 13 lines

  Better exception messages for unittest assert methods.

  - unittest.assertNotEqual() now uses the inequality operator (!=) instead
    of the equality operator.

  - Default assertTrue and assertFalse messages are now useful.

  - TestCase has a longMessage attribute. This defaults to False, but if set to True
    useful error messages are shown in addition to explicit messages passed to assert methods.

  Issue #5663
........
  r71036 | jesse.noller | 2009-04-02 06:22:09 +0200 (Do, 02 Apr 2009) | 1 line

  Issue 3551: Raise ValueError if the size causes ERROR_NO_SYSTEM_RESOURCES
........
  r71070 | antoine.pitrou | 2009-04-02 23:18:34 +0200 (Do, 02 Apr 2009) | 3 lines

  Issue #2396: backport the memoryview object.
........
  r71075 | raymond.hettinger | 2009-04-03 00:34:17 +0200 (Fr, 03 Apr 2009) | 1 line

  Update docs for namedtuple's renaming change.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70590 | skip.montanaro | 2009-03-25 01:52:11 +0100 (Mi, 25 Mär 2009) | 1 line

  clarify the type of data returned
........
  r70650 | benjamin.peterson | 2009-03-28 20:16:10 +0100 (Sa, 28 Mär 2009) | 1 line

  give os.symlink and os.link() better parameter names #5564
........
  r70704 | benjamin.peterson | 2009-03-30 04:49:32 +0200 (Mo, 30 Mär 2009) | 1 line

  there's actually three methods here #5600
........
  r70768 | andrew.kuchling | 2009-03-31 00:29:15 +0200 (Di, 31 Mär 2009) | 1 line

  Typo fixes
........
  r70769 | andrew.kuchling | 2009-03-31 00:29:53 +0200 (Di, 31 Mär 2009) | 1 line

  Remove comment
........
  r70776 | andrew.kuchling | 2009-03-31 01:08:24 +0200 (Di, 31 Mär 2009) | 1 line

  typo fix
........
  r71008 | andrew.kuchling | 2009-04-02 02:02:14 +0200 (Do, 02 Apr 2009) | 1 line

  Typo fix
........
  r71010 | benjamin.peterson | 2009-04-02 02:11:52 +0200 (Do, 02 Apr 2009) | 1 line

  fix markup
........
  r71011 | benjamin.peterson | 2009-04-02 02:12:47 +0200 (Do, 02 Apr 2009) | 1 line

  this should be :noindex:
........

Blocked revisions 70145,70261,70267,70271,70281,70286,70295,70298,70300,70305,70319,70471,70473,70485,70546,70555,70558,70561-70564,70568-70571,70574,70578,70588-70589 via svnmerge

........
  r70145 | benjamin.peterson | 2009-03-03 23:51:57 +0100 (Di, 03 Mär 2009) | 1 line

  making the writing more formal
........
  r70261 | raymond.hettinger | 2009-03-09 12:31:39 +0100 (Mo, 09 Mär 2009) | 1 line

  Issue 5443: Fix typo.
........
  r70267 | raymond.hettinger | 2009-03-09 12:57:29 +0100 (Mo, 09 Mär 2009) | 1 line

  Add consume() recipe to itertools docs.
........
  r70271 | raymond.hettinger | 2009-03-09 13:56:23 +0100 (Mo, 09 Mär 2009) | 1 line

  Add cross-reference to the collections docs.
........
  r70281 | benjamin.peterson | 2009-03-09 21:38:56 +0100 (Mo, 09 Mär 2009) | 1 line

  gzip and bz2 are context managers
........
  r70286 | raymond.hettinger | 2009-03-10 01:06:05 +0100 (Di, 10 Mär 2009) | 1 line

  Fix markup.
........
  r70295 | raymond.hettinger | 2009-03-10 09:16:05 +0100 (Di, 10 Mär 2009) | 1 line

  Update the decimal FAQ for the from_float() classmethod and improve the recipe for remove_exponent() to make it cut and pasteable.
........
  r70298 | raymond.hettinger | 2009-03-10 13:50:59 +0100 (Di, 10 Mär 2009) | 1 line

  For collections.deque() objects, expose the maxlen parameter as a read-only attribute.
........
  r70300 | raymond.hettinger | 2009-03-10 14:04:30 +0100 (Di, 10 Mär 2009) | 1 line

  Fix typo.
........
  r70305 | brett.cannon | 2009-03-11 05:51:06 +0100 (Mi, 11 Mär 2009) | 5 lines

  Require implementations for warnings.showwarning() support the 'line' argument.
  Was a DeprecationWarning for not supporting it since Python 2.6.

  Closes issue #3652.
........
  r70319 | raymond.hettinger | 2009-03-12 01:31:58 +0100 (Do, 12 Mär 2009) | 1 line

  Issue 5477: Fix buglet in the itertools documentation.
........
  r70471 | raymond.hettinger | 2009-03-19 20:19:03 +0100 (Do, 19 Mär 2009) | 3 lines

  Issue 5381:  Add object_pairs_hook to the json module.
........
  r70473 | raymond.hettinger | 2009-03-19 20:59:58 +0100 (Do, 19 Mär 2009) | 6 lines

  * Add clearer comment to initialization code.
  * Add optional argument to popitem() -- modeled
    after Anthon van der Neut's C version.
  * Fix method markup in docs.
........
  r70485 | raymond.hettinger | 2009-03-20 19:25:49 +0100 (Fr, 20 Mär 2009) | 1 line

  Add MutableSet example.
........
  r70546 | antoine.pitrou | 2009-03-23 19:41:45 +0100 (Mo, 23 Mär 2009) | 9 lines

  Issue #4688: Add a heuristic so that tuples and dicts containing only
  untrackable objects are not tracked by the garbage collector. This can
  reduce the size of collections and therefore the garbage collection overhead
  on long-running programs, depending on their particular use of datatypes.

  (trivia: this makes the "binary_trees" benchmark from the Computer Language
  Shootout 40% faster)
........
  r70555 | benjamin.peterson | 2009-03-23 22:50:21 +0100 (Mo, 23 Mär 2009) | 4 lines

  implement test skipping and expected failures

  patch by myself #1034053
........
  r70558 | benjamin.peterson | 2009-03-23 23:29:45 +0100 (Mo, 23 Mär 2009) | 4 lines

  comply with the evilJavaNamingScheme for attribute names

  It seems my love of PEP 8 overrode the need for consistentcy
........
  r70561 | benjamin.peterson | 2009-03-24 00:10:14 +0100 (Di, 24 Mär 2009) | 1 line

  refactor unittest docs
........
  r70562 | benjamin.peterson | 2009-03-24 00:13:36 +0100 (Di, 24 Mär 2009) | 1 line

  forgot to document that setUp can be skipped (silly me...)
........
  r70563 | benjamin.peterson | 2009-03-24 00:19:03 +0100 (Di, 24 Mär 2009) | 1 line

  update from CVS
........
  r70564 | raymond.hettinger | 2009-03-24 01:17:11 +0100 (Di, 24 Mär 2009) | 1 line

  Add links to related resources.
........
  r70568 | benjamin.peterson | 2009-03-24 01:35:20 +0100 (Di, 24 Mär 2009) | 1 line

  some cleanup and modernization
........
  r70569 | benjamin.peterson | 2009-03-24 01:36:16 +0100 (Di, 24 Mär 2009) | 1 line

  remove special metadata
........
  r70570 | benjamin.peterson | 2009-03-24 01:37:12 +0100 (Di, 24 Mär 2009) | 1 line

  update docstring
........
  r70571 | benjamin.peterson | 2009-03-24 01:39:24 +0100 (Di, 24 Mär 2009) | 1 line

  add new skipping things to __all__
........
  r70574 | benjamin.peterson | 2009-03-24 02:11:37 +0100 (Di, 24 Mär 2009) | 1 line

  fix typo
........
  r70578 | benjamin.peterson | 2009-03-24 04:24:56 +0100 (Di, 24 Mär 2009) | 1 line

  this is better written using assertRaises
........
  r70588 | benjamin.peterson | 2009-03-24 23:56:32 +0100 (Di, 24 Mär 2009) | 1 line

  fix newline issue in test summary
........
  r70589 | benjamin.peterson | 2009-03-25 00:07:07 +0100 (Mi, 25 Mär 2009) | 1 line

  another style nit
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70171 | facundo.batista | 2009-03-04 22:18:17 +0100 (Mi, 04 Mär 2009) | 3 lines

  Fixed a typo.
........
  r70183 | benjamin.peterson | 2009-03-05 01:17:57 +0100 (Do, 05 Mär 2009) | 1 line

  add example
........
  r70290 | raymond.hettinger | 2009-03-10 02:07:30 +0100 (Di, 10 Mär 2009) | 1 line

  Update url for the spec.
........
  r70292 | raymond.hettinger | 2009-03-10 05:40:24 +0100 (Di, 10 Mär 2009) | 1 line

  Clarify the meaning of normal and subnormal.
........
  r70315 | raymond.hettinger | 2009-03-12 01:25:03 +0100 (Do, 12 Mär 2009) | 1 line

  Add reference to solution for a commonly asked question.
........
  r70438 | benjamin.peterson | 2009-03-17 21:29:51 +0100 (Di, 17 Mär 2009) | 1 line

  I thought this was begging for an example
........
  r70464 | benjamin.peterson | 2009-03-18 21:58:09 +0100 (Mi, 18 Mär 2009) | 1 line

  a much better example
........

Blocked revisions 69908,69952-69953,69955,69959,69981,69983,70071,70081,70090,70120-70123,70126,70131-70132 via svnmerge

........
  r69908 | raymond.hettinger | 2009-02-23 20:32:55 +0100 (Mo, 23 Feb 2009) | 1 line

  Update itertools recipes to use next().
........
  r69952 | raymond.hettinger | 2009-02-25 01:37:57 +0100 (Mi, 25 Feb 2009) | 1 line

  Sync-up py3.1 doc updates for super().
........
  r69953 | raymond.hettinger | 2009-02-25 01:39:47 +0100 (Mi, 25 Feb 2009) | 1 line

  Restore Py2.x version of sample call to super().
........
  r69955 | raymond.hettinger | 2009-02-25 01:52:37 +0100 (Mi, 25 Feb 2009) | 1 line

  More markup and spelling fixes.
........
  r69959 | raymond.hettinger | 2009-02-25 02:06:52 +0100 (Mi, 25 Feb 2009) | 1 line

  Remove reference to zero argument form of super() in 2.x docs.
........
  r69981 | raymond.hettinger | 2009-02-25 23:48:24 +0100 (Mi, 25 Feb 2009) | 1 line

  Clarify Counter() docs.
........
  r69983 | raymond.hettinger | 2009-02-26 01:05:24 +0100 (Do, 26 Feb 2009) | 1 line

  Fix typo.
........
  r70071 | jeffrey.yasskin | 2009-02-28 20:03:21 +0100 (Sa, 28 Feb 2009) | 5 lines

  Backport r69961 to trunk, replacing JUMP_IF_{TRUE,FALSE} with
  POP_JUMP_IF_{TRUE,FALSE} and JUMP_IF_{TRUE,FALSE}_OR_POP. This avoids executing
  a POP_TOP on each conditional and sometimes allows the peephole optimizer to
  skip a JUMP_ABSOLUTE entirely. It speeds up list comprehensions significantly.
........
  r70081 | raymond.hettinger | 2009-03-01 03:04:32 +0100 (So, 01 Mär 2009) | 1 line

  Fix docs for ConfigParser.
........
  r70090 | gregory.p.smith | 2009-03-02 06:13:57 +0100 (Mo, 02 Mär 2009) | 3 lines

  Adds an optional flags argument to re.split, re.sub and re.subn to be
  consistent with the other re module functions.
........
  r70120 | raymond.hettinger | 2009-03-03 05:45:34 +0100 (Di, 03 Mär 2009) | 1 line

  Backport PEP 372: OrderedDict()
........
  r70121 | raymond.hettinger | 2009-03-03 05:51:24 +0100 (Di, 03 Mär 2009) | 3 lines

  Backport 70106: Add OrderedDict support to collections.namedtuple().
........
  r70122 | raymond.hettinger | 2009-03-03 06:00:37 +0100 (Di, 03 Mär 2009) | 3 lines

  Backport 70111: Let configparser use ordered dicts by default.
........
  r70123 | raymond.hettinger | 2009-03-03 06:11:56 +0100 (Di, 03 Mär 2009) | 1 line

  Fix markup.
........
  r70126 | raymond.hettinger | 2009-03-03 08:12:09 +0100 (Di, 03 Mär 2009) | 1 line

  Beef-up tests.
........
  r70131 | raymond.hettinger | 2009-03-03 21:53:51 +0100 (Di, 03 Mär 2009) | 1 line

  Make the underlying data structure more private.
........
  r70132 | raymond.hettinger | 2009-03-03 22:13:51 +0100 (Di, 03 Mär 2009) | 1 line

  Minor simplification.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69987 | benjamin.peterson | 2009-02-26 01:30:11 +0100 (Do, 26 Feb 2009) | 1 line

  fix str.format()'s first arg #5371
........
  r70002 | andrew.kuchling | 2009-02-26 23:34:30 +0100 (Do, 26 Feb 2009) | 1 line

  The curses panel library is now supported
........
  r70061 | hirokazu.yamamoto | 2009-02-28 16:24:00 +0100 (Sa, 28 Feb 2009) | 1 line

  Binary flag is needed on windows.
........

........
  r69522 | raymond.hettinger | 2009-02-12 06:39:46 +0100 (Do, 12 Feb 2009) | 3 lines

  Issue 5032:  added a step argument to itertools.count() and allowed non-integer arguments.
........
  r69604 | raymond.hettinger | 2009-02-14 01:25:51 +0100 (Sa, 14 Feb 2009) | 1 line

  Add keyword argument support to itertools.count().
........
  r69709 | raymond.hettinger | 2009-02-17 09:33:01 +0100 (Di, 17 Feb 2009) | 1 line

  Fix-up intro paragraph for collections docs.
........
  r69715 | raymond.hettinger | 2009-02-17 12:00:27 +0100 (Di, 17 Feb 2009) | 1 line

  Fixup intro paragraphs for the itertools docs.  Add some tables for quick reference.
........
  r69739 | raymond.hettinger | 2009-02-18 21:54:53 +0100 (Mi, 18 Feb 2009) | 1 line

  Generalize the itertools.tee() recipe.
........
  r69757 | raymond.hettinger | 2009-02-19 06:34:35 +0100 (Do, 19 Feb 2009) | 1 line

  Add some cross-references to the docs.  Simplify the python code equivalent for izip().  Supply an optional argument for the nth() recipe.
........
  r69761 | raymond.hettinger | 2009-02-19 06:51:41 +0100 (Do, 19 Feb 2009) | 1 line

  Add an example for math.fsum() and elaborate on the accurary note.
........
  r69765 | raymond.hettinger | 2009-02-19 07:55:03 +0100 (Do, 19 Feb 2009) | 1 line

  Add links to helpful external resources.
........
  r69777 | jeroen.ruigrok | 2009-02-19 19:52:21 +0100 (Do, 19 Feb 2009) | 3 lines

  Since we recommend one module per import line, reflect this also in the
  documentation.
........
  r69795 | benjamin.peterson | 2009-02-20 04:31:23 +0100 (Fr, 20 Feb 2009) | 1 line

  revert r69777 since all the experts agree that extra import lines distract from the code
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69520 | benjamin.peterson | 2009-02-12 04:50:00 +0100 (Do, 12 Feb 2009) | 1 line

  os.fsync() should be used to ensure that data is written to disk
........
  r69633 | hirokazu.yamamoto | 2009-02-15 10:19:48 +0100 (So, 15 Feb 2009) | 1 line

  Fixed typo.
........
  r69672 | benjamin.peterson | 2009-02-16 15:54:34 +0100 (Mo, 16 Feb 2009) | 1 line

  note functions that are not aliased to PyBytes_ #5280
........
  r69703 | raymond.hettinger | 2009-02-16 23:42:54 +0100 (Mo, 16 Feb 2009) | 3 lines

  Issue 5229: Documentation for super() neglects to say what super() actually does
........
  r69704 | raymond.hettinger | 2009-02-17 00:00:25 +0100 (Di, 17 Feb 2009) | 1 line

  Add explanation for super(type1, type2).
........
  r69717 | marc-andre.lemburg | 2009-02-17 13:48:19 +0100 (Di, 17 Feb 2009) | 5 lines

  Clarify the deprecation of platform.dist().

  Add versionadded tags.
........
  r69731 | gregory.p.smith | 2009-02-18 06:46:11 +0100 (Mi, 18 Feb 2009) | 3 lines

  Clarify socket timeout behavior vs system network stack behavior on connect
  for issue5293.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69509 | raymond.hettinger | 2009-02-11 01:06:17 +0100 (Mi, 11 Feb 2009) | 1 line

  Clean-up named tuple docs.
........

........
  r69480 | raymond.hettinger | 2009-02-10 02:24:05 +0100 (Di, 10 Feb 2009) | 1 line

  Issue 1818: collections.namedtuple() to support automatic renaming of invalid fieldnames.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69417 | benjamin.peterson | 2009-02-08 00:01:19 +0100 (So, 08 Feb 2009) | 1 line

  document individual 2to3 fixers
........
  r69435 | benjamin.peterson | 2009-02-08 15:38:13 +0100 (So, 08 Feb 2009) | 1 line

  document numliterals fixer
........
  r69442 | benjamin.peterson | 2009-02-08 16:14:57 +0100 (So, 08 Feb 2009) | 1 line

  a few edits and typos
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69159 | gregory.p.smith | 2009-02-01 01:16:01 +0100 (So, 01 Feb 2009) | 2 lines

  Update doc wording as suggested in issue4903.
........
  r69161 | gregory.p.smith | 2009-02-01 01:24:21 +0100 (So, 01 Feb 2009) | 2 lines

  wording for for issue4903.
........
  r69240 | raymond.hettinger | 2009-02-03 04:18:14 +0100 (Di, 03 Feb 2009) | 1 line

  Record operator deprecations in docs.
........
  r69271 | raymond.hettinger | 2009-02-04 11:52:32 +0100 (Mi, 04 Feb 2009) | 1 line

  Minor doc fixups.
........
  r69272 | raymond.hettinger | 2009-02-04 12:14:18 +0100 (Mi, 04 Feb 2009) | 1 line

  Doc fixes. Remove overbroad, redundant warnings.  Fixup example code.
........
  r69273 | raymond.hettinger | 2009-02-04 12:31:30 +0100 (Mi, 04 Feb 2009) | 1 line

  Tweak the docs for Counter() objects.
........
  r69276 | raymond.hettinger | 2009-02-04 20:25:17 +0100 (Mi, 04 Feb 2009) | 1 line

  Clarify that named tuples do not have to subclass tuple.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69131 | andrew.kuchling | 2009-01-31 04:26:02 +0100 (Sa, 31 Jan 2009) | 1 line

  Text edits and markup fixes
........
  r69140 | benjamin.peterson | 2009-01-31 17:52:03 +0100 (Sa, 31 Jan 2009) | 1 line

  PyErr_BadInternalCall() raises a SystemError, not TypeError #5112
........
  r69141 | benjamin.peterson | 2009-01-31 21:01:48 +0100 (Sa, 31 Jan 2009) | 1 line

  fix indentation
........
  r69155 | david.goodger | 2009-01-31 23:53:46 +0100 (Sa, 31 Jan 2009) | 1 line

  markup fix
........

........
  r69074 | raymond.hettinger | 2009-01-29 00:58:16 +0100 (Do, 29 Jan 2009) | 1 line

  Correct docs for ABCs (MutableSequence was missing __setiem).  Simplify the table by taking out inherited requirements for abstract methods.
........

........
  r68942 | raymond.hettinger | 2009-01-25 22:31:47 +0100 (So, 25 Jan 2009) | 1 line

  Improved itertools recipe for generating powerset().
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68842 | andrew.kuchling | 2009-01-21 03:16:26 +0100 (Mi, 21 Jan 2009) | 1 line

  Markup fixes
........
  r68862 | jesse.noller | 2009-01-22 22:53:22 +0100 (Do, 22 Jan 2009) | 1 line

  Issue 4593: apply() documentation is unclear
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68797 | raymond.hettinger | 2009-01-20 08:11:47 +0100 (Di, 20 Jan 2009) | 11 lines

  Don't disrupt automatic url target name generation
  with manually specified, conflicting names.

  Before:
      http://docs.python.org/dev/library/collections.html#id1

  After:
      http://docs.python.org/dev/library/collections.html#counter-objects
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68776 | benjamin.peterson | 2009-01-19 17:17:54 +0100 (Mo, 19 Jan 2009) | 1 line

  move BufferedIOBase into the base class section
........
  r68777 | benjamin.peterson | 2009-01-19 17:18:27 +0100 (Mo, 19 Jan 2009) | 1 line

  add email address
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68760 | vinay.sajip | 2009-01-19 07:49:19 +0100 (Mo, 19 Jan 2009) | 1 line

  Added more cross-reference targets and tidied up list of useful handlers.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68705 | benjamin.peterson | 2009-01-18 02:28:09 +0100 (So, 18 Jan 2009) | 1 line

  bytearrays are mutable sequences
........
  r68706 | benjamin.peterson | 2009-01-18 02:28:46 +0100 (So, 18 Jan 2009) | 1 line

  fix grammar
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68628 | benjamin.peterson | 2009-01-16 03:55:24 +0100 (Fr, 16 Jan 2009) | 1 line

  compare with == not is #4946
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68633 | thomas.heller | 2009-01-16 19:53:44 +0100 (Fr, 16 Jan 2009) | 3 lines

  Change an example in the docs to avoid a mistake when the code is copy
  pasted and changed afterwards.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68623 | vinay.sajip | 2009-01-15 23:48:13 +0100 (Do, 15 Jan 2009) | 1 line

  Made minor changes/corrections in markup. Added a couple of section headings.
........
  r68624 | vinay.sajip | 2009-01-16 00:04:47 +0100 (Fr, 16 Jan 2009) | 1 line

  Minor changes/corrections in markup.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68605 | raymond.hettinger | 2009-01-14 02:39:51 +0100 (Mi, 14 Jan 2009) | 1 line

  Fix-up indentation of sample code blocks for namedtuple mthod definitions.
........

Merged revisions 75312 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75312 | antoine.pitrou | 2009-10-10 22:52:11 +0200 (sam., 10 oct. 2009) | 4 lines

  Issue #7055: test___all__ now greedily detects all modules which have an
  __all__ attribute, rather than using a hardcoded and incomplete list.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75367 | antoine.pitrou | 2009-10-11 23:03:26 +0200 (dim., 11 oct. 2009) | 4 lines

  Issue #7084: Fix a (very unlikely) crash when printing a list from one
  thread, and mutating it from another one.  Patch by Scott Dial.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75570 | antoine.pitrou | 2009-10-20 23:29:37 +0200 (mar., 20 oct. 2009) | 6 lines

  Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which
  fixes the problem of some exceptions being thrown at shutdown when the
  interpreter is killed. Patch by Adam Olsen.
........
  r75574 | antoine.pitrou | 2009-10-20 23:59:25 +0200 (mar., 20 oct. 2009) | 4 lines

  Test wouldn't work in debug mode.
  We probably need a function in test_support to handle this.
........
  r75624 | antoine.pitrou | 2009-10-23 14:01:13 +0200 (ven., 23 oct. 2009) | 3 lines

  Fix Windows buildbot failure
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75633 | antoine.pitrou | 2009-10-23 20:32:15 +0200 (ven., 23 oct. 2009) | 3 lines

  Issue #7194: test_thread could try to release an unacquired mutex (and fail).
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75531 | antoine.pitrou | 2009-10-19 20:17:18 +0200 (lun., 19 oct. 2009) | 4 lines

  Issue #5833: Fix extra space character in readline completion with the
  GNU readline library version 6.0.
........
  r75725 | antoine.pitrou | 2009-10-26 20:16:46 +0100 (lun., 26 oct. 2009) | 4 lines

  Some platforms have rl_completion_append_character but not rl_completion_suppress_append.
  Reported by Mark D.
........

........
  r75697 | mark.dickinson | 2009-10-25 20:39:06 +0000 (Sun, 25 Oct 2009) | 3 lines

  Issue #1087418: Small performance boost for bitwise operations on longs.
  Initial patch by Gregory Smith;  some tweaks added.
........

........
  r75675 | eric.smith | 2009-10-24 15:50:44 -0400 (Sat, 24 Oct 2009) | 1 line

  Removed unused function PyFloat_AsStringEx. It is unused in floatobject.c, and it's not declared in any .h file.
........

........
  r75620 | eric.smith | 2009-10-22 16:13:14 -0400 (Thu, 22 Oct 2009) | 1 line

  Per the discussion in issue6882, backport the try/finally work that was done to the py3k version (mostly in r59477, I think).
........