Commit Graph

3381 Commits

Author SHA1 Message Date
Antoine Pitrou ea435512ea Merged revisions 83031 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83031 | antoine.pitrou | 2010-07-21 18:47:28 +0200 (mer., 21 juil. 2010) | 11 lines

  Merged revisions 83030 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83030 | antoine.pitrou | 2010-07-21 18:41:31 +0200 (mer., 21 juil. 2010) | 5 lines

    Issue #5395: check that array.fromfile() re-raises an IOError instead of replacing it
    with EOFError.
    (this is only an added test, but 2.x will get a fix too)
  ........
................
2010-07-21 16:50:52 +00:00
Mark Dickinson a63726ffc8 Merged revisions 82945 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82945 | mark.dickinson | 2010-07-18 08:55:55 +0100 (Sun, 18 Jul 2010) | 14 lines

  Merged revisions 82941,82943 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r82941 | mark.dickinson | 2010-07-18 08:29:02 +0100 (Sun, 18 Jul 2010) | 3 lines

    Issue #9277: Struct module: standard bool packing was incorrect if
    char is unsigned.  Thanks Stefan Krah for the patch.
  ........
    r82943 | mark.dickinson | 2010-07-18 08:48:20 +0100 (Sun, 18 Jul 2010) | 1 line

    Misc/NEWS entry for r82941.
  ........
................
2010-07-18 08:01:37 +00:00
R. David Murray edc0d2338d Merged revisions 82924 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82924 | r.david.murray | 2010-07-16 21:35:16 -0400 (Fri, 16 Jul 2010) | 11 lines

  Merged revisions 82922 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r82922 | r.david.murray | 2010-07-16 21:19:57 -0400 (Fri, 16 Jul 2010) | 4 lines

    #1555570: correctly handle a \r\n that is split by the read buffer.

    Patch and test by Tony Nelson.
  ........
................
2010-07-17 01:40:30 +00:00
Ronald Oussoren a729721628 Merged revisions 82791 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82791 | ronald.oussoren | 2010-07-11 10:52:52 +0200 (Sun, 11 Jul 2010) | 4 lines

  Fix for issue #9164: with this patch sysconfig and distuls don't break
  when duplicate '-arch foo' flags end up in CFLAGS (which may happen when
  building a universal build using macports)
........
2010-07-11 09:08:11 +00:00
R. David Murray bda5f2b3d9 Merged revisions 82732,82734,82738 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82732 | r.david.murray | 2010-07-09 09:16:00 -0400 (Fri, 09 Jul 2010) | 13 lines

  Merged revisions 82730 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  'merge' in the sense that this is the same fix by the same author.

  ........
    r82730 | r.david.murray | 2010-07-09 08:23:21 -0400 (Fri, 09 Jul 2010) | 4 lines

    7846: limit fnmatch pattern cache to _MAXCACHE=100 entries.

    Patch by Andrew Clegg.
  ........
................
  r82734 | r.david.murray | 2010-07-09 09:17:45 -0400 (Fri, 09 Jul 2010) | 9 lines

  Merged revisions 82731 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r82731 | r.david.murray | 2010-07-09 09:14:03 -0400 (Fri, 09 Jul 2010) | 2 lines

    Fix sort order mistake in Misc/ACKS.
  ........
................
  r82738 | r.david.murray | 2010-07-09 09:25:56 -0400 (Fri, 09 Jul 2010) | 2 lines

  Add missing NEWS entry for 7646.
................
2010-07-09 13:29:33 +00:00
Mark Dickinson 58338ccb98 Issue #9136: Fix 'dictionary changed size during iteration'
RuntimeError produced when profiling the decimal module.  This was
due to a dangerous iteration over 'locals()' in Context.__init__.
(Backport of r82656 from release27-maint.)
2010-07-08 21:27:05 +00:00
Mark Dickinson 060d6556aa Fix Decimal speed issue; backport of r82652 from release27-maint. 2010-07-08 19:27:24 +00:00
Mark Dickinson 1a7f3020a7 Issue #9130: Fix validation of relative imports in parser module. 2010-07-04 16:59:04 +00:00
Mark Dickinson 644bef795b Issue #9128: Fix validation of class decorators in parser module. 2010-07-04 16:28:57 +00:00
Victor Stinner e9123efa21 Merged revisions 82492 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82492 | victor.stinner | 2010-07-03 15:36:19 +0200 (sam., 03 juil. 2010) | 3 lines

  Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
  ensure that the input string length is a multiple of the frame size
........
2010-07-03 13:39:22 +00:00
Ezio Melotti 86e5e17bda Merged revisions 81758-81759 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81758 | ezio.melotti | 2010-06-05 20:51:07 +0300 (Sat, 05 Jun 2010) | 15 lines

  Update PyUnicode_DecodeUTF8 from RFC 2279 to RFC 3629.

  1) #8271: when a byte sequence is invalid, only the start byte and all the
     valid continuation bytes are now replaced by U+FFFD, instead of replacing
     the number of bytes specified by the start byte.
     See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf (pages 94-95);
  2) 5- and 6-bytes-long UTF-8 sequences are now considered invalid (no changes
     in behavior);
  3) Add code and tests to reject surrogates (U+D800-U+DFFF) as defined in
     RFC 3629, but leave it commented out since it's not backward compatible;
  4) Change the error messages "unexpected code byte" to "invalid start byte"
     and "invalid data" to "invalid continuation byte";
  5) Add an extensive set of tests in test_unicode;
  6) Fix test_codeccallbacks because it was failing after this change.
........
  r81759 | ezio.melotti | 2010-06-05 22:21:32 +0300 (Sat, 05 Jun 2010) | 1 line

  Add a NEWS entry for r81758 and clarify a comment.
........
2010-07-03 05:34:39 +00:00
Giampaolo Rodolà 1daf7aa2b2 Merged revisions 82404 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82404 | giampaolo.rodola | 2010-06-30 19:38:28 +0200 (mer, 30 giu 2010) | 1 line

  fix issue #6589: cleanup asyncore.socket_map if smtpd.SMTPServer constructor raises an exception
........
2010-06-30 17:41:25 +00:00
Mark Dickinson 9f11f39758 Merged revisions 82400 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82400 | mark.dickinson | 2010-06-30 17:27:57 +0100 (Wed, 30 Jun 2010) | 2 lines

  Issue #9125:  Update parser module for "except ... as ..." syntax.
........
2010-06-30 16:33:23 +00:00
R. David Murray c3175fcabf #9085: bump email package version to its correct value.
Previous versions of 2.6 have 4.0.1 because of a missed trunk
commit when 2.5 was released.
2010-06-26 19:01:40 +00:00
Antoine Pitrou b4f0e644bc Merged revisions 82210 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82210 | antoine.pitrou | 2010-06-25 02:03:21 +0200 (ven., 25 juin 2010) | 4 lines

  Issue #9075: In the ssl module, remove the setting of a `debug` flag
  on an OpenSSL structure.
........
2010-06-25 00:09:05 +00:00
Benjamin Peterson 8d6496385d Merged revisions 82157 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82157 | benjamin.peterson | 2010-06-22 14:16:37 -0500 (Tue, 22 Jun 2010) | 1 line

  remove INT_MAX assertions; they can fail with large Py_ssize_t #9058
........
2010-06-22 19:21:33 +00:00
Benjamin Peterson aae46dd89b Merged revisions 82130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82130 | benjamin.peterson | 2010-06-21 10:27:46 -0500 (Mon, 21 Jun 2010) | 1 line

  fix finding visual studio 2008 on 64 bit #8854
........
2010-06-21 15:39:28 +00:00
Stefan Krah ea568854b0 Issue #7384: If the system readline library is linked against
ncurses, do not link the readline module against ncursesw.
2010-06-16 14:17:22 +00:00
R. David Murray ff4a01dfaf Merged revisions 81675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81675 | r.david.murray | 2010-06-03 11:43:20 -0400 (Thu, 03 Jun 2010) | 10 lines

  #5610: use \Z not $ so we don't eat extra chars when body part ends with \r\n.

  If a body part ended with \r\n, feedparser, using '$' to terminate its
  search for the newline, would match on the \r\n, and think that it needed
  to strip two characters in order to account for the line end before the
  boundary.  That made it chop one too many characters off the end of
  the body part.  Using \Z makes the match correct.

  Patch and test by Tony Nelson.
........
2010-06-16 00:57:25 +00:00
Vinay Sajip f753d33665 Issue #8924: logging: Improved error handling for Unicode in exception text. 2010-06-11 22:56:50 +00:00
Antoine Pitrou 4595e51817 Merged revisions 81907 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81907 | antoine.pitrou | 2010-06-11 23:42:26 +0200 (ven., 11 juin 2010) | 5 lines

  Issue #8941: decoding big endian UTF-32 data in UCS-2 builds could crash
  the interpreter with characters outside the Basic Multilingual Plane
  (higher than 0x10000).
........
2010-06-11 21:48:02 +00:00
Philip Jenvey bc3376f66a Merged revisions 79779 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79779 | philip.jenvey | 2010-04-04 19:51:51 -0700 (Sun, 04 Apr 2010) | 2 lines

  fix escape_encode to return the correct consumed size
........
2010-06-09 17:55:28 +00:00
Benjamin Peterson 856333605a Merged revisions 81834 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81834 | benjamin.peterson | 2010-06-08 09:53:29 -0500 (Tue, 08 Jun 2010) | 1 line

  kill extra word
........
2010-06-08 14:58:25 +00:00
Benjamin Peterson c971913f84 Merged revisions 81820 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81820 | benjamin.peterson | 2010-06-07 17:23:23 -0500 (Mon, 07 Jun 2010) | 1 line

  correctly overflow when indexes are too large
........
2010-06-07 22:27:32 +00:00
Tarek Ziadé f7a65490a4 Merged revisions 81788 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81788 | tarek.ziade | 2010-06-06 22:05:20 +0200 (Sun, 06 Jun 2010) | 1 line

  Fixed #8909: now the doc details the size of the bitmap used in distutils' bdist_wininst
........
2010-06-06 20:10:03 +00:00
Mark Dickinson b671c29336 Merged revisions 81740 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81740 | mark.dickinson | 2010-06-05 13:14:43 +0100 (Sat, 05 Jun 2010) | 5 lines

  Issue #8627: Fix "XXX undetected error" from unchecked PyErr_WarnPy3k return.
  This is just a quick fix:  if the warning is turned into an exception, the
  exception simply gets ignored.
........
2010-06-05 12:15:35 +00:00
Mark Dickinson 80068da395 Merged revisions 81736 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81736 | mark.dickinson | 2010-06-05 12:52:24 +0100 (Sat, 05 Jun 2010) | 1 line

  Issue #8627: remove out-of-date warning about overriding __cmp__
........
2010-06-05 11:59:41 +00:00
Martin v. Löwis c5010e0669 Merged revisions 81701 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81701 | martin.v.loewis | 2010-06-04 21:39:07 +0200 (Fr, 04 Jun 2010) | 2 lines

  Issue #6470: Drop UNC prefix in FixTk.py
  Patch by Christop Gohlke and Amaury Forgeot d'Arc.
........
2010-06-04 19:46:21 +00:00
Lars Gustäbel 9bcbe49ba1 Merged revisions 81663 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81663 | lars.gustaebel | 2010-06-03 11:56:22 +0200 (Thu, 03 Jun 2010) | 4 lines

  Issue #8833: tarfile created hard link entries with a size
  field != 0 by mistake. The associated testcase did not
  expose this bug because it was broken too.
........
2010-06-03 10:07:08 +00:00
R. David Murray e036af0ce5 Merged revisions 81658 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81658 | r.david.murray | 2010-06-02 18:03:15 -0400 (Wed, 02 Jun 2010) | 9 lines

  #1368247: make set_charset/MIMEText automatically encode unicode _payload.

  Fixes (mysterious, to the end user) UnicodeErrors when using utf-8 as
  the charset and unicode as the _text argument.  Also makes the way in
  which unicode gets encoded to quoted printable for other charsets more
  sane (it only worked by accident previously).  The _payload now is encoded
  to the charset.output_charset if it is unicode.
........
2010-06-02 22:11:01 +00:00
Alexander Belopolsky cfd6bc0395 Merged revisions 81566 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81566 | alexander.belopolsky | 2010-05-27 16:55:27 -0400 (Thu, 27 May 2010) | 3 lines

  Issue #7150: Raise OverflowError if the result of adding or subtracting
  timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range.
........
2010-05-27 21:53:16 +00:00
Brian Curtin b7b21f1ea4 Merged revisions 81517 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81517 | brian.curtin | 2010-05-25 10:06:15 -0500 (Tue, 25 May 2010) | 5 lines

  Fix #2810 - handle the case where some registry calls return
  ERROR_MORE_DATA, requiring another call to get the remaining data.

  Patch by Daniel Stutzbach
........
2010-05-26 13:24:57 +00:00
Victor Stinner c3e40e0454 Merged revisions 81537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81537 | victor.stinner | 2010-05-26 00:30:32 +0200 (mer., 26 mai 2010) | 3 lines

  Issue #3798: Write sys.exit() message to sys.stderr to use stderr encoding and
  error handler, instead of writing to the C stderr file in utf-8
........
2010-05-25 22:40:38 +00:00
Victor Stinner b0c42877de Merged revisions 81500-81501 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81500 | victor.stinner | 2010-05-24 23:33:24 +0200 (lun., 24 mai 2010) | 2 lines

  Issue #6662: Fix parsing of malformatted charref (&#bad;)
........
  r81501 | victor.stinner | 2010-05-24 23:37:28 +0200 (lun., 24 mai 2010) | 2 lines

  Add the author of the last fix (Issue #6662)
........
2010-05-24 21:42:59 +00:00
Jean-Paul Calderone c28d554db8 Merged revisions 74426 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74426 | gregory.p.smith | 2009-08-13 14:54:50 -0400 (Thu, 13 Aug 2009) | 4 lines

  Fix issue1628205: Socket file objects returned by socket.socket.makefile() now
  properly handles EINTR within the read, readline, write & flush methods.
  The socket.sendall() method now properly handles interrupted system calls.
........
2010-05-23 15:22:08 +00:00
Victor Stinner 09c0f24f39 Merged revisions 81471-81472 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81471 | victor.stinner | 2010-05-22 15:37:56 +0200 (sam., 22 mai 2010) | 7 lines

  Issue #6268: More bugfixes about BOM, UTF-16 and UTF-32

   * Fix seek() method of codecs.open(), don't write the BOM twice after seek(0)
   * Fix reset() method of codecs, UTF-16, UTF-32 and StreamWriter classes
   * test_codecs: use "w+" mode instead of "wt+". "t" mode is not supported by
     Solaris or Windows, but does it really exist? I found it the in the issue.
........
  r81472 | victor.stinner | 2010-05-22 15:44:25 +0200 (sam., 22 mai 2010) | 4 lines

  Fix my last commit (r81471) about codecs

  Rememder: don't touch the code just before a commit
........
2010-05-22 16:52:13 +00:00
Georg Brandl f9f33aa38d Merged revisions 81465-81466 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81465 | georg.brandl | 2010-05-22 13:29:19 +0200 (Sa, 22 Mai 2010) | 2 lines

  Issue #3924: Ignore cookies with invalid "version" field in cookielib.
........
  r81466 | georg.brandl | 2010-05-22 13:31:16 +0200 (Sa, 22 Mai 2010) | 1 line

  Underscore the name of an internal utility function.
........
2010-05-22 11:32:59 +00:00
Victor Stinner f5a3eafaac Merged revisions 81459 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81459 | victor.stinner | 2010-05-22 04:11:07 +0200 (sam., 22 mai 2010) | 3 lines

  Issue #6268: Fix seek() method of codecs.open(), don't read the BOM twice
  after seek(0)
........
2010-05-22 02:12:28 +00:00
Victor Stinner 9a4a01df75 Merged revisions 81454 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81454 | victor.stinner | 2010-05-22 00:50:28 +0200 (sam., 22 mai 2010) | 3 lines

  Issue #5640: Fix Shift-JIS incremental encoder for error handlers different
  than strict
........
2010-05-21 22:55:31 +00:00
Benjamin Peterson a3401654e1 Merged revisions 81432 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81432 | benjamin.peterson | 2010-05-21 16:31:24 -0500 (Fri, 21 May 2010) | 1 line

  ensure the last line has a trailing newline #8782
........
2010-05-21 21:45:16 +00:00
Benjamin Peterson 0278a67e83 Merged revisions 81414 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81414 | benjamin.peterson | 2010-05-21 15:51:45 -0500 (Fri, 21 May 2010) | 1 line

  return NotImplemented from Mapping when comparing to a non-mapping #8729
........
2010-05-21 21:03:02 +00:00
Antoine Pitrou 52ca516cac Merged revisions 81398 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81398 | antoine.pitrou | 2010-05-21 19:12:38 +0200 (ven., 21 mai 2010) | 6 lines

  Issue #5753: A new C API function, :cfunc:`PySys_SetArgvEx`, allows
  embedders of the interpreter to set sys.argv without also modifying
  sys.path.  This helps fix `CVE-2008-5983
  <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
........
2010-05-21 17:22:43 +00:00
Brett Cannon 7d006260a5 Merged revisions 81380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81380 | brett.cannon | 2010-05-20 11:37:55 -0700 (Thu, 20 May 2010) | 8 lines

  Turned out that if you used explicit relative import syntax
  (e.g. from .os import sep) and it failed, import would still try the implicit
  relative import semantics of an absolute import (from os import sep). That's
  not right, so when level is negative, only do explicit relative import
  semantics.

  Fixes issue #7902. Thanks to Meador Inge for the patch.
........
2010-05-20 18:41:08 +00:00
Georg Brandl f72cae4afa Merged revisions 72645 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72645 | antoine.pitrou | 2009-05-14 21:48:09 +0000 (Do, 14 Mai 2009) | 6 lines

  Issue #5918: Fix a crash in the parser module.

  Patch by Amaury.
........
2010-05-19 00:07:47 +00:00
Georg Brandl eb41214dbc Merged revisions 79822,79828,79862,80067,80069,80080-80081,80084,80432-80433 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79822 | georg.brandl | 2010-04-06 08:18:15 +0000 (Di, 06 Apr 2010) | 1 line

  #8320: document return value of recv_into().
........
  r79828 | georg.brandl | 2010-04-06 14:33:44 +0000 (Di, 06 Apr 2010) | 1 line

  Add JP.
........
  r79862 | georg.brandl | 2010-04-06 20:27:59 +0000 (Di, 06 Apr 2010) | 1 line

  Fix syntax.
........
  r80067 | georg.brandl | 2010-04-14 08:53:38 +0000 (Mi, 14 Apr 2010) | 1 line

  #5341: typo.
........
  r80069 | georg.brandl | 2010-04-14 13:50:31 +0000 (Mi, 14 Apr 2010) | 1 line

  Add an x-ref to where the O_ constants are documented and move the SEEK_ constants after lseek().
........
  r80080 | georg.brandl | 2010-04-14 19:16:38 +0000 (Mi, 14 Apr 2010) | 1 line

  #8399: add note about Windows and O_BINARY.
........
  r80081 | georg.brandl | 2010-04-14 21:34:44 +0000 (Mi, 14 Apr 2010) | 1 line

  #5250: document __instancecheck__ and __subclasscheck__.  I hope the part about the class/metaclass distinction is understandable.
........
  r80084 | georg.brandl | 2010-04-14 21:46:45 +0000 (Mi, 14 Apr 2010) | 1 line

  Fix missing.
........
  r80432 | georg.brandl | 2010-04-24 08:56:58 +0000 (Sa, 24 Apr 2010) | 1 line

  Markup fixes.
........
  r80433 | georg.brandl | 2010-04-24 09:08:10 +0000 (Sa, 24 Apr 2010) | 1 line

  #7507: quote "!" in pipes.quote(); it is a special character for some shells.
........
2010-05-18 23:19:34 +00:00
Antoine Pitrou 5de1594e28 Merged revisions 81275 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81275 | antoine.pitrou | 2010-05-17 21:56:59 +0200 (lun., 17 mai 2010) | 4 lines

  Issue #7079: Fix a possible crash when closing a file object while using
  it from another thread.  Patch by Daniel Stutzbach.
........
2010-05-17 20:00:52 +00:00
Tarek Ziadé e728116357 Merged revisions 81255 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81255 | tarek.ziade | 2010-05-17 12:06:20 +0200 (Mon, 17 May 2010) | 1 line

  Fixed #8688: Distutils now recalculates MANIFEST everytime.
........
2010-05-17 10:26:15 +00:00
Victor Stinner 5b4d7ffaaa Recorded merge of revisions 81205 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81205 | victor.stinner | 2010-05-15 23:00:59 +0200 (sam., 15 mai 2010) | 2 lines

  NEWS: strip trailing spaces
........
2010-05-15 21:03:33 +00:00
Antoine Pitrou c400610321 Issue #7640: In the new `io` module, fix relative seek() for buffered
readable streams when the internal buffer isn't empty.  Patch by Pascal
Chambon.
2010-05-15 20:33:07 +00:00
Brett Cannon b565ac8776 Merged revisions 81154 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81154 | brett.cannon | 2010-05-13 17:21:48 -0700 (Thu, 13 May 2010) | 15 lines

  subprocess.Popen.__del__ referenced global objects, which is a no-no thanks to
  interpreter shutdown semantics. Same issue goes for the methods that __del__
  called. Now all the methods capture the global objects it needs as default
  values to private parameters (could have stuck them on the class object itself,
  but since the objects have nothing directly to do with the class that seemed
  wrong).

  There is no test as making one that works is hard. This patch was
  verified against a consistently failing test in Mercurial's test suite, though,
  so it has been tested in some regard.

  Closes issue #5099. Thanks to Mary Stern for the bug report and Gabriel
  Genellina for writing another patch for the same issue and attempting to write
  a test.
........
2010-05-14 01:26:08 +00:00