granicus.if.org Git - python/log

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

................
  r80317 | antoine.pitrou | 2010-04-21 21:46:23 +0200 (mer., 21 avril 2010) | 15 lines

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

  ........
    r80314 | antoine.pitrou | 2010-04-21 21:28:03 +0200 (mer., 21 avril 2010) | 5 lines

    Issue #8484: Load all ciphers and digest algorithms when initializing
    the _ssl extension, such that verification of some SSL certificates
    doesn't fail because of an "unknown algorithm".
  ........
    r80315 | antoine.pitrou | 2010-04-21 21:36:23 +0200 (mer., 21 avril 2010) | 3 lines

    Forgot to add the sample certificate (followup to r80314)
  ........
................

Blocked revisions 80309 via svnmerge

................
  r80309 | tarek.ziade | 2010-04-21 15:35:21 +0200 (Wed, 21 Apr 2010) | 9 lines

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

  ........
    r80306 | tarek.ziade | 2010-04-21 15:32:26 +0200 (Wed, 21 Apr 2010) | 1 line

    shutil: removed unused import and fixed attributes names in _call_external_zip
  ........
................

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

................
  r80296 | r.david.murray | 2010-04-20 21:51:57 -0400 (Tue, 20 Apr 2010) | 14 lines

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

  ........
    r80144 | r.david.murray | 2010-04-17 01:26:26 -0400 (Sat, 17 Apr 2010) | 8 lines

    Issue #3864: Skip three test_signal tests on freebsd6 due to platform bug.

    Two itimer tests and an interprocess signal test fail on FreeBSD 6 if
    any test that starts a thread runs before test_signal.  Since FreeBSD7
    does not show this behavior, the bug is most likely a platform bug,
    so this patch just skips the failing tests on freebsd6.
  ........
................

Blocked revisions 80293 via svnmerge

........
r80293 | mark.dickinson | 2010-04-21 00:24:25 +0100 (Wed, 21 Apr 2010) | 1 line

Rework delta_divmod to avoid use of PyTuple_SetItem.
........

Blocked revisions 80290-80291 via svnmerge

........
  r80290 | mark.dickinson | 2010-04-20 23:32:49 +0100 (Tue, 20 Apr 2010) | 12 lines

  Issue #2706:  Add support for dividing a timedelta by another timedelta.

  Adds support for the three division operations:

    - timedelta / timedelta -> float
    - timedelta // timedelta -> int
    - timedelta % timedelta -> timedelta

  also adds support for divmod(timedelta, timedelta).

  Patch by Alexander Belopolsky.
........
  r80291 | mark.dickinson | 2010-04-20 23:39:53 +0100 (Tue, 20 Apr 2010) | 1 line

  Fix memory leak.
........

Blocked revisions 80286 via svnmerge

................
  r80286 | tarek.ziade | 2010-04-20 23:40:47 +0200 (Tue, 20 Apr 2010) | 9 lines

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

  ........
    r80282 | tarek.ziade | 2010-04-20 23:09:06 +0200 (Tue, 20 Apr 2010) | 1 line

    removed ztar support in shutil.make_archive
  ........
................

Ensure the framework installs cleanly after
the recent changes to CFLAGS and BASECFLAGS.

Blocked revisions 80263 via svnmerge

........
r80263 | tarek.ziade | 2010-04-20 16:31:49 +0200 (Tue, 20 Apr 2010) | 1 line

fixed typo -- thanks Nick
........

Blocked revisions 80261 via svnmerge

........
r80261 | ezio.melotti | 2010-04-20 14:26:51 +0300 (Tue, 20 Apr 2010) | 1 line

Add missing arg, fix indentation and spelling.
........

Blocked revisions 80259 via svnmerge

........
r80259 | ezio.melotti | 2010-04-20 13:57:44 +0300 (Tue, 20 Apr 2010) | 1 line

Fix two versionchanged.
........

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

................
  r80256 | senthil.kumaran | 2010-04-20 16:05:49 +0530 (Tue, 20 Apr 2010) | 9 lines

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

  ........
    r80236 | senthil.kumaran | 2010-04-20 12:24:59 +0530 (Tue, 20 Apr 2010) | 3 lines

    Fix Issue8460: Victor's patch to add timeout in test_urllib2net test_urls.
  ........
................

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

........
r80207 | sean.reifschneider | 2010-04-19 09:06:12 +0300 (Mon, 19 Apr 2010) | 2 lines

I'll maintain syslog. I've made most of the "recent" changes to it anyway.
........

Blocked revisions 80251 via svnmerge

........
r80251 | ezio.melotti | 2010-04-20 12:41:59 +0300 (Tue, 20 Apr 2010) | 1 line

Update the python version in the interpreter tutorial.
........

Add a missing versionadded in unittest.rst.

Blocked revisions 80248 via svnmerge

........
r80248 | ezio.melotti | 2010-04-20 12:32:54 +0300 (Tue, 20 Apr 2010) | 1 line

Fix versionadded in unittest.rst.
........

Blocked revisions 80246 via svnmerge

........
r80246 | tarek.ziade | 2010-04-20 11:13:23 +0200 (Tue, 20 Apr 2010) | 1 line

added a note on shutil.copytree improvements
........

Blocked revisions 80244 via svnmerge

........
r80244 | tarek.ziade | 2010-04-20 10:57:33 +0200 (Tue, 20 Apr 2010) | 1 line

Fixed #6547: Added the ignore_dangling_symlinks option to shutil.copytree
........

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

................
  r80240 | stefan.krah | 2010-04-20 10:13:03 +0200 (Tue, 20 Apr 2010) | 15 lines

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

  ........
    r80238 | stefan.krah | 2010-04-20 09:59:10 +0200 (Tue, 20 Apr 2010) | 9 lines

    1) The timeout in the itimer tests was too low for slow or heavily
       loaded machines.

    2) Even with the increased timeout, the OS does not guarantee that
       a process will get a certain amount of virtual time in 60s, so
       the failure is changed to a diagnostic.
  ........
................

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

................
  r80233 | ronald.oussoren | 2010-04-20 08:36:47 +0200 (Tue, 20 Apr 2010) | 10 lines

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

  ........
    r80232 | ronald.oussoren | 2010-04-20 07:50:44 +0200 (Tue, 20 Apr 2010) | 3 lines

    Explicitly set system default for $PATH to
    ensure we have a clean build environment (OSX installer)
  ........
................

Blocked revisions 80230 via svnmerge

........
r80230 | tarek.ziade | 2010-04-20 00:30:51 +0200 (Tue, 20 Apr 2010) | 1 line

Fixed #1540112: now shutil.copytree will let you provide your own copy() function
........

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

................
  r80228 | giampaolo.rodola | 2010-04-20 00:05:54 +0200 (mar, 20 apr 2010) | 9 lines

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

  ........
    r80226 | giampaolo.rodola | 2010-04-19 23:46:28 +0200 (lun, 19 apr 2010) | 1 line

    Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT commands
  ........
................

Blocked revisions 80224 via svnmerge

................
  r80224 | tarek.ziade | 2010-04-19 23:31:42 +0200 (Mon, 19 Apr 2010) | 9 lines

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

  ........
    r80221 | tarek.ziade | 2010-04-19 23:28:21 +0200 (Mon, 19 Apr 2010) | 1 line

    Fixed #8463: added missing reference to bztar in shutil's documentation.
  ........
................

Blocked revisions 80219 via svnmerge

................
  r80219 | tarek.ziade | 2010-04-19 23:19:57 +0200 (Mon, 19 Apr 2010) | 9 lines

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

  ........
    r80218 | tarek.ziade | 2010-04-19 23:13:03 +0200 (Mon, 19 Apr 2010) | 1 line

    few pep8 fixes
  ........
................

Issue 8436: set.__init__ accepts keyword args

Fix for issue #5652

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

........
  r80198 | ronald.oussoren | 2010-04-18 22:46:11 +0200 (Sun, 18 Apr 2010) | 4 lines

  For for issue #7154: Port the code that uses
  the SystemConfiguration framework to detect the
  proxy settings on OSX from the trunk to python 3.2
........

Issue 8420: Fix ref counting problem in set_repr().

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

................
  r80191 | ronald.oussoren | 2010-04-18 21:07:43 +0200 (Sun, 18 Apr 2010) | 13 lines

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

  ........
    r80187 | ronald.oussoren | 2010-04-18 19:59:37 +0200 (Sun, 18 Apr 2010) | 6 lines

    Add the OSX universal binary related options
    to CFLAGS instead of BASECFLAGS.

    This fixes issue 8366 and is needed due to
    changes introduced in the fix for issue 1628484.
  ........
................

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

................
  r80185 | ronald.oussoren | 2010-04-18 17:24:17 +0200 (Sun, 18 Apr 2010) | 12 lines

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

  ........
    r80179 | ronald.oussoren | 2010-04-18 16:01:05 +0200 (Sun, 18 Apr 2010) | 5 lines

    Add check to build-installer.py to ensure that
    the right version of Tcl/Tk is available (on OSX)

    Fixes issue #5651
  ........
................

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

................
  r80182 | ronald.oussoren | 2010-04-18 17:02:38 +0200 (Sun, 18 Apr 2010) | 9 lines

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

  ........
    r80178 | ronald.oussoren | 2010-04-18 15:47:49 +0200 (Sun, 18 Apr 2010) | 2 lines

    Fix for issue #7072
  ........
................

Recorded merge of revisions 80176 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80176 | giampaolo.rodola | 2010-04-18 15:36:35 +0200 (dom, 18 apr 2010) | 9 lines

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

  ........
    r80172 | giampaolo.rodola | 2010-04-18 14:55:03 +0200 (dom, 18 apr 2010) | 1 line

    Fix Issue #3817: 225 is now considered a valid response code for ABOR
  ........
................

Fix Issue #3817: 225 is now considered a valid response code for ABOR

Blocked revisions 80163 via svnmerge

........
  r80163 | victor.stinner | 2010-04-18 10:23:42 +0200 (dim., 18 avril 2010) | 4 lines

  Issue #8422, test_genericpath: skip the creation of a directory with an invalid
  UTF name on Mac OS X because the OS deny it (the name have to be a valid UTF8
  string).
........

Blocked revisions 80161 via svnmerge

........
  r80161 | victor.stinner | 2010-04-18 09:59:53 +0200 (dim., 18 avril 2010) | 4 lines

  Issue #8340, test_abs_path() of test_site: encode paths to ASCII with
  backslashreplace to avoid locale issues, don't write stderr to a pipe to ease
  debug, separate directories by newlines instead of a space.
........

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

........
  r80159 | victor.stinner | 2010-04-18 02:00:44 +0200 (dim., 18 avril 2010) | 3 lines

  Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with
  surrogates.
........

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

................
  r80148 | senthil.kumaran | 2010-04-17 20:14:14 +0530 (Sat, 17 Apr 2010) | 9 lines

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

  ........
    r80146 | senthil.kumaran | 2010-04-17 20:00:53 +0530 (Sat, 17 Apr 2010) | 3 lines

    Fix Issue5650 - Update the RFC List in the urlparse module.
  ........
................

Blocked revisions 80135 via svnmerge

........
  r80135 | victor.stinner | 2010-04-17 01:49:32 +0200 (sam., 17 avril 2010) | 5 lines

  Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for
  the current working directory.

  Remove also a trailing space, and replace tabulation indentation by spaces.
........

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

........
r79957 | benjamin.peterson | 2010-04-11 11:13:23 -0500 (Sun, 11 Apr 2010) | 1 line

add 3.1.2
........

Merged revisions 80125,80128,80130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80125 | benjamin.peterson | 2010-04-16 17:35:32 -0500 (Fri, 16 Apr 2010) | 13 lines

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

  ........
    r80123 | benjamin.peterson | 2010-04-16 17:24:16 -0500 (Fri, 16 Apr 2010) | 1 line

    bytearray -> type2test
  ........
    r80124 | benjamin.peterson | 2010-04-16 17:25:57 -0500 (Fri, 16 Apr 2010) | 1 line

    fix typo
  ........
................
  r80128 | benjamin.peterson | 2010-04-16 17:51:37 -0500 (Fri, 16 Apr 2010) | 9 lines

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

  ........
    r80126 | benjamin.peterson | 2010-04-16 17:35:38 -0500 (Fri, 16 Apr 2010) | 1 line

    have a clear error when passing something > sys.maxsize to bytearray
  ........
................
  r80130 | benjamin.peterson | 2010-04-16 18:00:53 -0500 (Fri, 16 Apr 2010) | 9 lines

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

  ........
    r80129 | benjamin.peterson | 2010-04-16 17:52:44 -0500 (Fri, 16 Apr 2010) | 1 line

    tiny simplification
  ........
................

Merged revisions 80108,80111,80114-80115 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r80108 | victor.stinner | 2010-04-16 13:23:43 +0100 (Fri, 16 Apr 2010) | 4 lines

  Add CS_GNU_LIBC_VERSION and CS_GNU_LIBPTHREAD_VERSION constants for constr(),
  and disable test_execvpe_with_bad_program() of test_os if the libc uses
  linuxthreads to avoid the "unknown signal 32" bug (see issue #4970).
........
  r80111 | mark.dickinson | 2010-04-16 13:47:52 +0100 (Fri, 16 Apr 2010) | 1 line

  Keep confstr entries in alphabetical order.
........
  r80114 | mark.dickinson | 2010-04-16 14:45:35 +0100 (Fri, 16 Apr 2010) | 1 line

  Issue #4970:  move linuxthreads check outside the affected test, and use skipIf
........
  r80115 | mark.dickinson | 2010-04-16 14:51:27 +0100 (Fri, 16 Apr 2010) | 1 line

  Don't assume that os.confstr_names exists.
........

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

........
  r80112 | victor.stinner | 2010-04-16 15:28:05 +0200 (ven., 16 avril 2010) | 3 lines

  Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII
  using backslashreplace error handler.
........

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

........
r80116 | victor.stinner | 2010-04-16 17:10:27 +0200 (ven., 16 avril 2010) | 2 lines

Issue #7605: Fix test_cmd_line if the current working directory is not ASCII
........

Merged revisions 75538,75542,77012,77928,79113,79999,80109 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r75538 | kurt.kaiser | 2009-10-19 15:39:00 -0400 (Mon, 19 Oct 2009) | 2 lines

  add myself to idlelib
........
  r75542 | raymond.hettinger | 2009-10-19 15:52:20 -0400 (Mon, 19 Oct 2009) | 1 line

  Add maintainers.
........
  r77012 | ezio.melotti | 2009-12-23 15:56:09 -0500 (Wed, 23 Dec 2009) | 1 line

  Rephrased the introduction, added missing commas and my name for Unicode
........
  r77928 | tarek.ziade | 2010-02-02 18:31:01 -0500 (Tue, 02 Feb 2010) | 1 line

  added myself as the maintainer for sysconfig and shutil
........
  r79113 | benjamin.peterson | 2010-03-19 17:01:27 -0400 (Fri, 19 Mar 2010) | 1 line

  make maintainers.rst have correct eol
........
  r79999 | r.david.murray | 2010-04-12 11:19:03 -0400 (Mon, 12 Apr 2010) | 4 lines

  Kurt's roundup id is kbk, use that in maintainers.rst instead of
  his checkin id, since maintainers is for finding people to make
  nosy in the tracker.
........
  r80109 | r.david.murray | 2010-04-16 08:34:45 -0400 (Fri, 16 Apr 2010) | 5 lines

  maintainers.rst additions.

  Add Giampaolo Rodola as an expert for ftplib, and Victor Stinner
  to the 'unicode' interest area.
........

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

........
  r80105 | victor.stinner | 2010-04-16 13:45:13 +0200 (ven., 16 avril 2010) | 3 lines

  Issue #8412: os.system() now accepts bytes, bytearray and str with
  surrogates.
........

Blocked revisions 80106 via svnmerge

................
  r80106 | victor.stinner | 2010-04-16 14:07:30 +0200 (ven., 16 avril 2010) | 9 lines

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

  ........
    r79892 | martin.v.loewis | 2010-04-07 13:01:46 +0200 (mer., 07 avril 2010) | 2 lines

    Issue #8314: Fix unsigned long long bug in libffi on Sparc v8.
  ........
................

python 3.1 doesn't have the new libffi 3.0.9 (it uses libffi 3.0.5).

Reverting the previous checkin (80103). The feature should not have been merged to 3.1 maint.

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

................
  r80102 | senthil.kumaran | 2010-04-16 08:32:13 +0530 (Fri, 16 Apr 2010) | 9 lines

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

  ........
    r80101 | senthil.kumaran | 2010-04-16 08:16:46 +0530 (Fri, 16 Apr 2010) | 3 lines

    Fix issue2987: RFC2732 support for urlparse (IPv6 addresses)
  ........
................

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

........
r80092 | senthil.kumaran | 2010-04-15 22:48:22 +0530 (Thu, 15 Apr 2010) | 2 lines

Fix Issue5419 - explaining bytes return value of urlopen, use of .decode() to convert to str.
........

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

................
  r80078 | r.david.murray | 2010-04-14 14:59:18 -0400 (Wed, 14 Apr 2010) | 9 lines

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

  ........
    r80062 | r.david.murray | 2010-04-13 16:57:40 -0400 (Tue, 13 Apr 2010) | 2 lines

    Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters.
  ........
................

Fixed extraneous _winreg (changed to winreg in py3k). Thanks, Tim Golden.

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

........
r80040 | mark.dickinson | 2010-04-13 12:54:59 +0100 (Tue, 13 Apr 2010) | 1 line

Fix invalid syntax.
........

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

................
  r80036 | mark.dickinson | 2010-04-13 12:43:10 +0100 (Tue, 13 Apr 2010) | 9 lines

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

  ........
    r80035 | mark.dickinson | 2010-04-13 12:37:23 +0100 (Tue, 13 Apr 2010) | 1 line

    In test_winsound, don't try to import _winreg until after checking that winsound is supported.
  ........
................

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

........
  r80031 | victor.stinner | 2010-04-13 13:07:24 +0200 (mar., 13 avril 2010) | 4 lines

  Issue #8383: pickle and pickletools use surrogatepass error handler when
  encoding unicode as utf8 to support lone surrogates and stay compatible with
  Python 2.x and 3.0
........

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

................
  r80027 | brian.curtin | 2010-04-12 21:32:40 -0500 (Mon, 12 Apr 2010) | 11 lines

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

  ........
    r80026 | brian.curtin | 2010-04-12 21:25:20 -0500 (Mon, 12 Apr 2010) | 4 lines

    Fix #7306. Add skips to test_winsound when no default sound is configured.

    These failures occur on a Windows Server 2003 machine I test on.
  ........
................

Add usage notes for collections.Counter()

More NaN consistency fixes (manual merge of r79875 to release31-maint).

Blocked revisions 80006 via svnmerge

................
  r80006 | r.david.murray | 2010-04-12 12:58:02 -0400 (Mon, 12 Apr 2010) | 19 lines

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

  ........
    r80004 | r.david.murray | 2010-04-12 12:35:19 -0400 (Mon, 12 Apr 2010) | 13 lines

    Issue #7585: use tab between components in unified and context diff headers.

    Instead of spaces between the filename and date (or whatever the string
    is that follows the filename, if any) use tabs.  This is what the unix
    'diff' command does, for example, and difflib was intended to follow
    the 'standard' way of doing diffs.  This improves compatibility with
    patch tools.  The docs and examples are also changed to recommended that
    the date format used be the ISO 8601 format, which is what modern diff
    tools emit by default.

    Patch by Anatoly Techtonik.
  ........
................

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

................
  r80002 | stefan.krah | 2010-04-12 17:33:12 +0200 (Mon, 12 Apr 2010) | 9 lines

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

  ........
    r80000 | stefan.krah | 2010-04-12 17:21:25 +0200 (Mon, 12 Apr 2010) | 3 lines

    Issue #8367: Fix spurious test failure on systems without a sound card.
  ........
................

typo

Blocked revisions 79992 via svnmerge

........
r79992 | tarek.ziade | 2010-04-12 10:23:49 +0200 (Mon, 12 Apr 2010) | 1 line

Fixed #8375 - test_distutils now checks what remains to be cleaned up during tearDown
........

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

................
  r79990 | senthil.kumaran | 2010-04-12 12:33:17 +0530 (Mon, 12 Apr 2010) | 9 lines

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

  ........
    r79988 | senthil.kumaran | 2010-04-12 12:20:24 +0530 (Mon, 12 Apr 2010) | 3 lines

    Adding additional examples of valid urls as per RFC 3986 (for issue8339)
  ........
................

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

................
  r79983 | antoine.pitrou | 2010-04-12 02:16:50 +0200 (lun., 12 avril 2010) | 14 lines

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

  ........
    r79982 | antoine.pitrou | 2010-04-12 02:10:46 +0200 (lun., 12 avril 2010) | 8 lines

    It is possible to add extra testing options using EXTRATESTOPTS.
    When such extra options include "-x testname", subsequent arguments
    are all taken as test names to ignore. Therefore, standard options
    must be passed before *TESTOPTS.

    (witnessed on the ARM buildbots)
  ........
................

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

................
  r79960 | stefan.krah | 2010-04-11 18:49:20 +0200 (Sun, 11 Apr 2010) | 22 lines

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

  ........
    r79954 | stefan.krah | 2010-04-11 17:15:54 +0200 (Sun, 11 Apr 2010) | 17 lines

    Fix for issues #3581, #1481 and #7650:

    1. The assumptions in check_node() were too restrictive:

         - Hardware addresses with universal_local_bit=1 are valid
           (locally administered).

         - Many of the tested functions (including uuid.getnode())
           may return valid RFC 4122 random node IDs. These are pretty
           much random 48-bit values with the multicast bit set to 1.

    2. _unixdll_getnode() calls _uuid_generate_time(), which may be None
       on some platforms. The resulting TypeError is now caught.
  ........
................

Fixup new itertools recipes.

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

................
  r79912 | antoine.pitrou | 2010-04-09 22:42:09 +0200 (ven., 09 avril 2010) | 10 lines

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

  ........
    r79910 | antoine.pitrou | 2010-04-09 22:38:39 +0200 (ven., 09 avril 2010) | 4 lines

    SSL_MODE_AUTO_RETRY has been added in OpenSSL 0.9.6.  Fix compilation
    with earlier versions.
  ........
................

Issue #8328: Silence Visual Studio warnings.

Blocked revisions 79886 via svnmerge

................
  r79886 | stefan.krah | 2010-04-07 10:49:55 +0200 (Wed, 07 Apr 2010) | 9 lines

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

  ........
    r79885 | stefan.krah | 2010-04-07 10:24:44 +0200 (Wed, 07 Apr 2010) | 1 line

    Issue #8328: Silence Visual Studio warnings.
  ........
................

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

................
  r79873 | mark.dickinson | 2010-04-06 23:13:37 +0100 (Tue, 06 Apr 2010) | 9 lines

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

  ........
    r79871 | mark.dickinson | 2010-04-06 23:10:55 +0100 (Tue, 06 Apr 2010) | 2 lines

    Use consistent spelling for nans (thanks Georg for noticing).
  ........
................

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

................
  r79868 | benjamin.peterson | 2010-04-06 16:55:16 -0500 (Tue, 06 Apr 2010) | 13 lines

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

  ........
    r79866 | benjamin.peterson | 2010-04-06 16:37:06 -0500 (Tue, 06 Apr 2010) | 1 line

    use skip decorator
  ........
    r79867 | benjamin.peterson | 2010-04-06 16:50:00 -0500 (Tue, 06 Apr 2010) | 1 line

    remove a optimization that resulted in unexpected behavior #8929
  ........
................

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

................
  r79860 | mark.dickinson | 2010-04-06 20:55:03 +0100 (Tue, 06 Apr 2010) | 10 lines

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

  ........
    r79858 | mark.dickinson | 2010-04-06 20:50:03 +0100 (Tue, 06 Apr 2010) | 3 lines

    Issue #7947:  Clarify math module behaviour for IEEE 754 special cases, along
    with a number of additional minor edits and typo corrections.
  ........
................

Blocked revisions 79853 via svnmerge

................
  r79853 | mark.dickinson | 2010-04-06 19:22:06 +0100 (Tue, 06 Apr 2010) | 9 lines

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

  ........
    r79852 | mark.dickinson | 2010-04-06 19:20:11 +0100 (Tue, 06 Apr 2010) | 1 line

    Issue #8259: Clarify that there's an upper bound on the right-hand operand of a shift operator.
  ........
................

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

................
  r79849 | antoine.pitrou | 2010-04-06 19:23:13 +0200 (mar., 06 avril 2010) | 9 lines

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

  ........
    r79848 | antoine.pitrou | 2010-04-06 19:21:09 +0200 (mar., 06 avril 2010) | 3 lines

    Issue #8193: Fix test_zlib failure with zlib 1.2.4.
  ........
................

Blocked revisions 79845 via svnmerge

................
  r79845 | mark.dickinson | 2010-04-06 17:53:17 +0100 (Tue, 06 Apr 2010) | 15 lines

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

  ........
    r79843 | mark.dickinson | 2010-04-06 17:46:09 +0100 (Tue, 06 Apr 2010) | 4 lines

    Issue #8259: Get rid of 'outrageous left shift count' error when
    left-shifting an integer by more than 2**31 on a 64-bit machine.  Also
    convert shift counts to a Py_ssize_t instead of a C long.
  ........
    r79844 | mark.dickinson | 2010-04-06 17:47:55 +0100 (Tue, 06 Apr 2010) | 1 line

    Misc/NEWS entry for r79843.
  ........
................

Blocked revisions 79839 via svnmerge

........
r79839 | mark.dickinson | 2010-04-06 16:47:14 +0100 (Tue, 06 Apr 2010) | 1 line

Remove out-of-date comment.
........

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

........
  r78918 | mark.dickinson | 2010-03-13 11:34:40 +0000 (Sat, 13 Mar 2010) | 4 lines

  Issue #8014: Fix PyLong_As<c-integer-type> methods not to produce an
  internal error on non-integer input: they now raise TypeError instead.
  This is needed for attributes declared via PyMemberDefs.
........
  r78920 | mark.dickinson | 2010-03-13 13:23:05 +0000 (Sat, 13 Mar 2010) | 3 lines

  Issue #8014: Fix incorrect error checks in structmember.c, and re-enable
  previously failing test_structmember.py tests.
........

Blocked revisions 79835 via svnmerge

................
  r79835 | eric.smith | 2010-04-06 11:21:59 -0400 (Tue, 06 Apr 2010) | 9 lines

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

  ........
    r79833 | eric.smith | 2010-04-06 11:17:33 -0400 (Tue, 06 Apr 2010) | 1 line

    Note that PEP 378 also applies to int.
  ........
................

Blocked revisions 79831 via svnmerge

................
  r79831 | eric.smith | 2010-04-06 10:57:57 -0400 (Tue, 06 Apr 2010) | 9 lines

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

  ........
    r79826 | eric.smith | 2010-04-06 10:30:15 -0400 (Tue, 06 Apr 2010) | 1 line

    Fixed PEP 378 example.
  ........
................

Blocked revisions 79823 via svnmerge

................
  r79823 | mark.dickinson | 2010-04-06 11:29:17 +0100 (Tue, 06 Apr 2010) | 9 lines

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

  ........
    r79809 | mark.dickinson | 2010-04-05 19:54:51 +0100 (Mon, 05 Apr 2010) | 1 line

    Use a better NaN test in _Py_HashDouble as well.
  ........
................

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

................
  r79819 | senthil.kumaran | 2010-04-06 09:00:18 +0530 (Tue, 06 Apr 2010) | 9 lines

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

  ........
    r79817 | senthil.kumaran | 2010-04-06 08:53:33 +0530 (Tue, 06 Apr 2010) | 2 lines

    Fix Issue8262 - changing RuntimeError wording to "Threads can only be started once"
  ........
................

Blocked revisions 79805 via svnmerge

................
  r79805 | mark.dickinson | 2010-04-05 19:09:39 +0100 (Mon, 05 Apr 2010) | 12 lines

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

  ........
    r79804 | mark.dickinson | 2010-04-05 19:07:51 +0100 (Mon, 05 Apr 2010) | 5 lines

    Use a more robust infinity check in _Py_HashDouble.

    This fixes a test_decimal failure on FreeBSD 8.0.  (modf apparently
    doesn't follow C99 Annex F on FreeBSD.)
  ........
................

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

................
  r79799 | ezio.melotti | 2010-04-05 16:25:51 +0300 (Mon, 05 Apr 2010) | 9 lines

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

  ........
    r79797 | ezio.melotti | 2010-04-05 15:51:45 +0300 (Mon, 05 Apr 2010) | 1 line

    Fix some broken URLs.
  ........
................

Blocked revisions 79790 via svnmerge

................
  r79790 | ezio.melotti | 2010-04-05 11:21:29 +0300 (Mon, 05 Apr 2010) | 9 lines

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

  ........
    r79788 | ezio.melotti | 2010-04-05 11:16:41 +0300 (Mon, 05 Apr 2010) | 1 line

    Fix markup errors.
  ........
................

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

........
r79615 | georg.brandl | 2010-04-02 23:12:42 +0300 (Fri, 02 Apr 2010) | 1 line

#8288: fix next -> __next__.
........

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

................
  r79783 | ezio.melotti | 2010-04-05 07:04:35 +0300 (Mon, 05 Apr 2010) | 9 lines

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

  ........
    r79781 | ezio.melotti | 2010-04-05 06:51:38 +0300 (Mon, 05 Apr 2010) | 1 line

    #8212: rephrase the webservers howto and fix some mistakes.
  ........
................

Blocked revisions 79773 via svnmerge

................
  r79773 | ezio.melotti | 2010-04-05 02:27:45 +0300 (Mon, 05 Apr 2010) | 9 lines

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

  ........
    r79768 | ezio.melotti | 2010-04-05 02:21:53 +0300 (Mon, 05 Apr 2010) | 1 line

    Fix markup in decimal.rst.
  ........
................

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

................
  r79765 | benjamin.peterson | 2010-04-04 18:09:06 -0500 (Sun, 04 Apr 2010) | 9 lines

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

  ........
    r79763 | benjamin.peterson | 2010-04-04 18:03:22 -0500 (Sun, 04 Apr 2010) | 1 line

    fix tabs
  ........
................

Blocked revisions 79757 via svnmerge

................
  r79757 | mark.dickinson | 2010-04-04 23:13:14 +0100 (Sun, 04 Apr 2010) | 13 lines

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

  ........
    r79756 | mark.dickinson | 2010-04-04 23:09:21 +0100 (Sun, 04 Apr 2010) | 6 lines

    Add versionchanged entry for Decimal(float) construction.

    Also add an example of constructing a Decimal directly from a float,
    update the quickstart tutorial, and tweak another couple of
    sentences.
  ........
................

Blocked revisions 79752 via svnmerge

................
  r79752 | mark.dickinson | 2010-04-04 22:23:57 +0100 (Sun, 04 Apr 2010) | 9 lines

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

  ........
    r79751 | mark.dickinson | 2010-04-04 22:19:35 +0100 (Sun, 04 Apr 2010) | 1 line

    A handful of whitespace fixes in Modules/_struct.c.
  ........
................

Blocked revisions 79742 via svnmerge

................
  r79742 | ezio.melotti | 2010-04-04 10:21:15 +0300 (Sun, 04 Apr 2010) | 9 lines

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

  ........
    r79740 | ezio.melotti | 2010-04-04 10:00:02 +0300 (Sun, 04 Apr 2010) | 1 line

    Use more specific assert* methods in test_struct.
  ........
................

Blocked revisions 79662,79737 via svnmerge

................
  r79662 | raymond.hettinger | 2010-04-03 13:32:58 +0300 (Sat, 03 Apr 2010) | 1 line

  Add a subtract() method to collections.Counter()
................
  r79737 | ezio.melotti | 2010-04-04 09:53:44 +0300 (Sun, 04 Apr 2010) | 13 lines

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

  ........
    r79733 | ezio.melotti | 2010-04-04 09:41:27 +0300 (Sun, 04 Apr 2010) | 1 line

    Add a versionadded to Counter.subtract() doc.
  ........
    r79735 | ezio.melotti | 2010-04-04 09:50:58 +0300 (Sun, 04 Apr 2010) | 1 line

    Revert 79733 - Counter is new in 2.7, the versionadded is not necessary - and fix a typo.
  ........
................

Blocked revisions 79731 via svnmerge

........
r79731 | ezio.melotti | 2010-04-04 09:30:08 +0300 (Sun, 04 Apr 2010) | 1 line

Fix versionchanged from 2.7 to 3.2 in decimal.rst.
........

Blocked revisions 79701 via svnmerge

................
  r79701 | mark.dickinson | 2010-04-03 16:51:03 +0100 (Sat, 03 Apr 2010) | 9 lines

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

  ........
    r79699 | mark.dickinson | 2010-04-03 16:47:46 +0100 (Sat, 03 Apr 2010) | 1 line

    Add Misc/NEWS entry for r79609.
  ........
................

Blocked revisions 79689 via svnmerge

........
r79689 | ezio.melotti | 2010-04-03 18:27:05 +0300 (Sat, 03 Apr 2010) | 1 line

Add -bb to rt.bat to do some extra checks during the tests (it is already used by the non-Windows buildbots).
........

Blocked revisions 79688 via svnmerge

........
r79688 | mark.dickinson | 2010-04-03 16:26:31 +0100 (Sat, 03 Apr 2010) | 1 line

Internal refactoring in struct.pack: make all integer conversions go through get_pylong.
........

Blocked revisions 79600 via svnmerge

................
  r79600 | ezio.melotti | 2010-04-02 16:56:40 +0300 (Fri, 02 Apr 2010) | 15 lines

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

  Add -Wd to the flags used to run the tests (-3 is not necessary here).

  ........
    r79540 | ezio.melotti | 2010-04-01 01:18:09 +0300 (Thu, 01 Apr 2010) | 1 line

    Add -Wd and -3 to the flags used to run the tests.
  ........
    r79541 | ezio.melotti | 2010-04-01 01:43:31 +0300 (Thu, 01 Apr 2010) | 1 line

    Add -Wd and -3 to the flags used to run the tests on Windows.
  ........
................

Blocked revisions 79683 via svnmerge

........
r79683 | mark.dickinson | 2010-04-03 16:07:40 +0100 (Sat, 03 Apr 2010) | 1 line

Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
........

Blocked revisions 79681 via svnmerge

................
  r79681 | ezio.melotti | 2010-04-03 17:59:49 +0300 (Sat, 03 Apr 2010) | 9 lines

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

  ........
    r79678 | ezio.melotti | 2010-04-03 17:51:00 +0300 (Sat, 03 Apr 2010) | 1 line

    Use more specific assert* methods in test_decimal.
  ........
................

Blocked revisions 79676 via svnmerge

........
r79676 | mark.dickinson | 2010-04-03 15:24:58 +0100 (Sat, 03 Apr 2010) | 1 line

Remove unused define.
........

Blocked revisions 79670 via svnmerge

................
  r79670 | mark.dickinson | 2010-04-03 12:18:52 +0100 (Sat, 03 Apr 2010) | 9 lines

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

  ........
    r79629 | mark.dickinson | 2010-04-02 23:27:36 +0100 (Fri, 02 Apr 2010) | 2 lines

    Issue #8294:  Allow float and Decimal arguments in Fraction constructor.
  ........
................

Blocked revisions 79668 via svnmerge

................
  r79668 | mark.dickinson | 2010-04-03 12:08:14 +0100 (Sat, 03 Apr 2010) | 26 lines

  Merged revisions 79583,79588-79589 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79583 | mark.dickinson | 2010-04-02 09:53:22 +0100 (Fri, 02 Apr 2010) | 7 lines

    Issue #2531: Make float-to-decimal comparisons return correct results.

    Float to decimal comparison operations now return a result based on
    the numeric values of the operands.  Decimal.__hash__ has also been
    fixed so that Decimal and float values that compare equal have equal
    hash value.
  ........
    r79588 | mark.dickinson | 2010-04-02 11:17:07 +0100 (Fri, 02 Apr 2010) | 2 lines

    Issue #7279:  Make comparisons involving a Decimal sNaN signal InvalidOperation.
  ........
    r79589 | mark.dickinson | 2010-04-02 11:35:12 +0100 (Fri, 02 Apr 2010) | 6 lines

    Issue #7279:  Make Decimal('nan') hashable.  Decimal('snan') remains unhashable.

    Also rewrite the Decimal __hash__ method so that it doesn't rely on
    float('inf') being valid: float('inf') could raise an exception on
    platforms not using IEEE 754 arithmetic.
  ........
................