Merged revisions 78793,78798-78799,78977,79095,79196,79474 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78793 | florent.xicluna | 2010-03-08 13:25:35 +0100 (lun, 08 mar 2010) | 2 lines

  Fix macpath to deal with bytes
................
  r78798 | florent.xicluna | 2010-03-08 14:32:17 +0100 (lun, 08 mar 2010) | 18 lines

  Merged revisions 78777,78787,78790 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78777 | florent.xicluna | 2010-03-08 00:49:03 +0100 (lun, 08 mar 2010) | 4 lines

    Backport the Popen.poll() protection from subprocess to multiprocessing. See #1731717.
    It should fix transient failures on test_multiprocessing.
  ........
    r78787 | florent.xicluna | 2010-03-08 08:21:16 +0100 (lun, 08 mar 2010) | 2 lines

    Don't fail on a debug() statement, if the worker PID is (still) None.
  ........
    r78790 | florent.xicluna | 2010-03-08 12:01:39 +0100 (lun, 08 mar 2010) | 2 lines

    On finalize, don't try to join not started process.
  ........
................
  r78799 | florent.xicluna | 2010-03-08 15:44:41 +0100 (lun, 08 mar 2010) | 2 lines

  Fix ntpath abspath to deal with bytes.
................
  r78977 | florent.xicluna | 2010-03-15 14:14:39 +0100 (lun, 15 mar 2010) | 2 lines

  Fix \xhh specs, #1889.  (an oversight of r60193, r60210).
................
  r79095 | florent.xicluna | 2010-03-19 15:40:31 +0100 (ven, 19 mar 2010) | 2 lines

  Rename test.test_support to test.support for 3.x.
................
  r79196 | florent.xicluna | 2010-03-21 13:29:50 +0100 (dim, 21 mar 2010) | 9 lines

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

  ........
    r79195 | florent.xicluna | 2010-03-21 13:27:20 +0100 (dim, 21 mar 2010) | 2 lines

    Issue #8179: Fix macpath.realpath() on a non-existing path.
  ........
................
  r79474 | florent.xicluna | 2010-03-28 01:25:02 +0100 (dim, 28 mar 2010) | 33 lines

  Merged revisions 79297,79310,79382,79425-79427,79450 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines

    #7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.
  ........
    r79310 | florent.xicluna | 2010-03-22 23:52:11 +0100 (lun, 22 mar 2010) | 2 lines

    Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only).
  ........
    r79382 | florent.xicluna | 2010-03-24 20:33:25 +0100 (mer, 24 mar 2010) | 2 lines

    Skip tests which depend on multiprocessing.sharedctypes, if _ctypes is not available.
  ........
    r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines

    Syntax cleanup `== None` -> `is None`
  ........
    r79426 | florent.xicluna | 2010-03-25 21:33:49 +0100 (jeu, 25 mar 2010) | 2 lines

    #8207: Fix test_pep277 on OS X
  ........
    r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines

    Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest"
  ........
    r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines

    Ensure that the failed or unexpected tests are sorted before printing.
  ........
................

................
  r78499 | florent.xicluna | 2010-02-27 16:16:59 +0100 (sam, 27 fév 2010) | 8 lines

  Blocked revisions 78497 via svnmerge

  ........
    r78497 | florent.xicluna | 2010-02-27 16:10:19 +0100 (sam, 27 fév 2010) | 2 lines

    #7793: Fix RuntimeError when running "regrtest -R" for multibyte codecs.
  ........
................
  r79472 | florent.xicluna | 2010-03-27 23:18:04 +0100 (sam, 27 mar 2010) | 27 lines

  Blocked revisions 79288,79295-79296,79334,79378 via svnmerge

  ........
    r79288 | florent.xicluna | 2010-03-22 16:02:46 +0100 (lun, 22 mar 2010) | 2 lines

    Get rid of buffer() in test_ctypes:  backport the 3.x tests.
  ........
    r79295 | florent.xicluna | 2010-03-22 17:07:38 +0100 (lun, 22 mar 2010) | 3 lines

    Issue #7703: ctypes supports both buffer() and memoryview().  The former is deprecated.
    Complement of r79288.
  ........
    r79296 | florent.xicluna | 2010-03-22 17:36:51 +0100 (lun, 22 mar 2010) | 3 lines

    Preserve backward compatibility of the ctypes module.
    "This file should be kept compatible with Python 2.3, see PEP 291."
  ........
    r79334 | florent.xicluna | 2010-03-23 12:07:54 +0100 (mar, 23 mar 2010) | 2 lines

    Skip test_format_deprecation if _ctypes is not available.  Add a filter to the warning check.
  ........
    r79378 | florent.xicluna | 2010-03-24 18:32:58 +0100 (mer, 24 mar 2010) | 3 lines

    Skip test_ascii_formatd if _ctypes is not available (BSD, ...).
    Previous change was incomplete (r79334).
  ........
................

Blocked revisions 78510,78583,78607,78654-78655,78663,78672,78674,78676,78702,78705,78723-78725,78727,78733,78792,78795-78797,78801,78829,78831,78834,78929,78942,78945,78961,79033,79050,79062,79065,79083,79088,79093-79094,79102,79128,79145,79209,79473 via svnmerge

................
  r78510 | florent.xicluna | 2010-02-27 23:12:37 +0100 (sam, 27 fév 2010) | 13 lines

  Recorded merge of revisions 78508-78509 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78508 | florent.xicluna | 2010-02-27 20:20:50 +0100 (sam, 27 fév 2010) | 2 lines

    Clean test_subprocess: use assertRaises, skipIf, skipUnless helpers and a custom helper assertStderrEqual.
  ........
    r78509 | florent.xicluna | 2010-02-27 22:15:27 +0100 (sam, 27 fév 2010) | 2 lines

    Fix an oversight in r78508: p.wait() should be compared to 0
  ........
................
  r78583 | florent.xicluna | 2010-03-02 17:06:24 +0100 (mar, 02 mar 2010) | 9 lines

  Recorded merge of revisions 78582 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78582 | florent.xicluna | 2010-03-02 17:00:00 +0100 (mar, 02 mar 2010) | 2 lines

    Refactor test_dict using assertRaises.
  ........
................
  r78607 | florent.xicluna | 2010-03-03 01:06:37 +0100 (mer, 03 mar 2010) | 17 lines

  Merged revisions 78585,78594,78606 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78585 | florent.xicluna | 2010-03-02 22:34:45 +0100 (mar, 02 mar 2010) | 2 lines

    Tentatively enable test_pep277 on all platforms.
  ........
    r78594 | florent.xicluna | 2010-03-02 23:34:11 +0100 (mar, 02 mar 2010) | 2 lines

    Test test_pep277 is only relevant for Unicode-friendly filesystems.
  ........
    r78606 | florent.xicluna | 2010-03-03 00:56:38 +0100 (mer, 03 mar 2010) | 2 lines

    Fix wording.
  ........
................
  r78654 | florent.xicluna | 2010-03-04 17:10:10 +0100 (jeu, 04 mar 2010) | 9 lines

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

  ........
    r78653 | florent.xicluna | 2010-03-04 16:58:54 +0100 (jeu, 04 mar 2010) | 2 lines

    #7805: wait until all workers are started before collecting their PIDs
  ........
................
  r78655 | florent.xicluna | 2010-03-04 17:10:55 +0100 (jeu, 04 mar 2010) | 2 lines

  Missing part from r78654
................
  r78663 | florent.xicluna | 2010-03-04 22:50:56 +0100 (jeu, 04 mar 2010) | 16 lines

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

  ........
    r78661 | florent.xicluna | 2010-03-04 20:40:48 +0100 (jeu, 04 mar 2010) | 2 lines

    Cleanup.
  ........
    r78662 | florent.xicluna | 2010-03-04 22:31:58 +0100 (jeu, 04 mar 2010) | 2 lines

    #2777: Enable test_send_signal, test_kill and test_terminate on all platforms.
  ........


  And fix an oversight of changeset 78510.
................
  r78672 | florent.xicluna | 2010-03-05 01:52:00 +0100 (ven, 05 mar 2010) | 10 lines

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

  ........
    r78671 | florent.xicluna | 2010-03-05 01:47:40 +0100 (ven, 05 mar 2010) | 3 lines

    Workaround #3137: Retry SIGINT if it is not received the first time.
    test_send_signal should not hang anymore on various Linux distributions.
  ........
................
  r78674 | florent.xicluna | 2010-03-05 02:07:40 +0100 (ven, 05 mar 2010) | 2 lines

  Remove some debug line...
................
  r78676 | florent.xicluna | 2010-03-05 02:18:04 +0100 (ven, 05 mar 2010) | 9 lines

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

  ........
    r78673 | florent.xicluna | 2010-03-05 02:05:55 +0100 (ven, 05 mar 2010) | 2 lines

    Let's use assertIsNone / assertIsNotNone. It's hype.
  ........
................
  r78702 | florent.xicluna | 2010-03-05 21:26:54 +0100 (ven, 05 mar 2010) | 9 lines

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

  ........
    r78701 | florent.xicluna | 2010-03-05 20:31:21 +0100 (ven, 05 mar 2010) | 2 lines

    #2777: Handle fds more carefully to try to fix some x86-Linux failures (namely, neal bot and twisted bot).
  ........
................
  r78705 | florent.xicluna | 2010-03-06 01:19:38 +0100 (sam, 06 mar 2010) | 9 lines

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

  ........
    r78704 | florent.xicluna | 2010-03-06 01:16:57 +0100 (sam, 06 mar 2010) | 2 lines

    #2777: Apply same recipe for test_terminate and test_kill, i.e. close or redirect fds.
  ........
................
  r78723 | florent.xicluna | 2010-03-06 12:43:55 +0100 (sam, 06 mar 2010) | 14 lines

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

  ........
    r78719 | florent.xicluna | 2010-03-06 09:07:44 +0100 (sam, 06 mar 2010) | 3 lines

    Keep the test files in the ./build/ subdirectory, if Python is not installed.
    Remove two hacks which are no longer needed after #7712, because all __file__ attributes are absolute.
  ........
    r78720 | florent.xicluna | 2010-03-06 10:11:55 +0100 (sam, 06 mar 2010) | 2 lines

    Print platform information to stdout, to help troubleshooting platform-specific failures.
  ........
................
  r78724 | florent.xicluna | 2010-03-06 12:52:51 +0100 (sam, 06 mar 2010) | 9 lines

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

  ........
    r78721 | florent.xicluna | 2010-03-06 10:54:14 +0100 (sam, 06 mar 2010) | 2 lines

    #2777: Apply same recipe on win32, i.e. do not inherit file handles.
  ........
................
  r78725 | florent.xicluna | 2010-03-06 15:04:16 +0100 (sam, 06 mar 2010) | 2 lines

  Fix test_pydoc when sys.modules["test"] is first imported using importlib.import_module.
................
  r78727 | florent.xicluna | 2010-03-06 15:43:34 +0100 (sam, 06 mar 2010) | 2 lines

  Fix TypeError on usage() when using regrtest switches which are not compatible.
................
  r78733 | florent.xicluna | 2010-03-06 18:34:48 +0100 (sam, 06 mar 2010) | 9 lines

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

  ........
    r78732 | florent.xicluna | 2010-03-06 18:24:36 +0100 (sam, 06 mar 2010) | 2 lines

    Do not print the header lines when running a single test.
  ........
................
  r78792 | florent.xicluna | 2010-03-08 13:24:53 +0100 (lun, 08 mar 2010) | 13 lines

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

  ........
    r78734 | florent.xicluna | 2010-03-06 19:07:18 +0100 (sam, 06 mar 2010) | 2 lines

    Create test_genericpath.CommonTest and reuse it to test other path modules.
  ........
    r78735 | florent.xicluna | 2010-03-06 19:52:52 +0100 (sam, 06 mar 2010) | 2 lines

    Minor tweaking of previous r78734, and add a NEWS entry.
  ........
................
  r78795 | florent.xicluna | 2010-03-08 13:42:20 +0100 (lun, 08 mar 2010) | 2 lines

  Merge other tests from test_*path.py into test_genericpath.CommonTest, and do some cleanup.
................
  r78796 | florent.xicluna | 2010-03-08 13:47:44 +0100 (lun, 08 mar 2010) | 2 lines

  Fix string-> bytes conversion on backport from 2.x.
................
  r78797 | florent.xicluna | 2010-03-08 14:27:26 +0100 (lun, 08 mar 2010) | 30 lines

  Merged revisions 78736,78759,78761,78767,78788-78789 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78736 | florent.xicluna | 2010-03-06 20:43:41 +0100 (sam, 06 mar 2010) | 2 lines

    Skip test_send_signal, test_kill, test_terminate on win32 platforms, for 2.7a4 release.
  ........
    r78759 | florent.xicluna | 2010-03-07 13:21:36 +0100 (dim, 07 mar 2010) | 2 lines

    #2777: Enable test_send_signal, test_terminate and test_kill on win32 platforms.
  ........
    r78761 | florent.xicluna | 2010-03-07 16:27:39 +0100 (dim, 07 mar 2010) | 4 lines

    Do not fail if returncode is 0 on send_signal/kill/terminate, for win32 platforms.
    Do not hide the KeyboardInterrupt on POSIX platforms.
  ........
    r78767 | florent.xicluna | 2010-03-07 18:12:23 +0100 (dim, 07 mar 2010) | 2 lines

    #2777: Try hard to make Win7 buildbot happy...
  ........
    r78788 | florent.xicluna | 2010-03-08 11:58:12 +0100 (lun, 08 mar 2010) | 2 lines

    Fix syntax: "rc != None" -> "rc is not None"
  ........
    r78789 | florent.xicluna | 2010-03-08 11:59:33 +0100 (lun, 08 mar 2010) | 2 lines

    Replace the stderr logging with assertNotEqual(returncode, 0).
  ........
................
  r78801 | florent.xicluna | 2010-03-08 16:34:35 +0100 (lun, 08 mar 2010) | 11 lines

  Backport the tests only.

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

  ........
    r78800 | florent.xicluna | 2010-03-08 16:20:28 +0100 (lun, 08 mar 2010) | 2 lines

    #7624: Fix isinstance(foo(), collections.Callable) for old-style classes.
  ........
................
  r78829 | florent.xicluna | 2010-03-11 01:05:17 +0100 (jeu, 11 mar 2010) | 9 lines

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

  ........
    r78828 | florent.xicluna | 2010-03-11 00:58:42 +0100 (jeu, 11 mar 2010) | 2 lines

    Issue #7880: Fix sysconfig when the python executable is a symbolic link.
  ........
................
  r78831 | florent.xicluna | 2010-03-11 02:00:26 +0100 (jeu, 11 mar 2010) | 10 lines

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

  ........
    r78830 | florent.xicluna | 2010-03-11 01:56:59 +0100 (jeu, 11 mar 2010) | 3 lines

    Fix the test_subprocess failure when sys.executable is meaningless: '' or a directory.
    It does not fix #7774.
  ........
................
  r78834 | florent.xicluna | 2010-03-11 02:53:10 +0100 (jeu, 11 mar 2010) | 9 lines

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

  ........
    r78833 | florent.xicluna | 2010-03-11 02:50:48 +0100 (jeu, 11 mar 2010) | 2 lines

    Revert r78830: realpath() should really be applied to sys.executable.
  ........
................
  r78929 | florent.xicluna | 2010-03-13 16:26:44 +0100 (sam, 13 mar 2010) | 24 lines

  Only the parts which are relevant for 3.x branch.

  Merged revisions 78757-78758,78769,78815 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78757 | florent.xicluna | 2010-03-07 13:14:25 +0100 (dim, 07 mar 2010) | 2 lines

    Fix some py3k warnings in the standard library.
  ........
    r78758 | florent.xicluna | 2010-03-07 13:18:33 +0100 (dim, 07 mar 2010) | 4 lines

    Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are
    effectively raised.  A new utility ``check_py3k_warnings`` deals with py3k warnings.
  ........
    r78769 | florent.xicluna | 2010-03-07 20:14:12 +0100 (dim, 07 mar 2010) | 2 lines

    Refresh the documentation for the test.test_support module.
  ........
    r78815 | florent.xicluna | 2010-03-09 20:57:01 +0100 (mar, 09 mar 2010) | 2 lines

    #7772: Fix test_py3kwarn. Now the test suite could pass with "-3" flag.
  ........
................
  r78942 | florent.xicluna | 2010-03-14 00:24:31 +0100 (dim, 14 mar 2010) | 30 lines

  Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78838 | florent.xicluna | 2010-03-11 15:36:19 +0100 (jeu, 11 mar 2010) | 2 lines

    Issue #6472: The xml.etree package is updated to ElementTree 1.3.  The cElementTree module is updated too.
  ........
    r78839 | florent.xicluna | 2010-03-11 16:55:11 +0100 (jeu, 11 mar 2010) | 2 lines

    Fix repr of tree Element on windows.
  ........
    r78917 | florent.xicluna | 2010-03-13 12:18:49 +0100 (sam, 13 mar 2010) | 2 lines

    Move the xml test data to their own directory.
  ........
    r78919 | florent.xicluna | 2010-03-13 13:41:48 +0100 (sam, 13 mar 2010) | 2 lines

    Do not chdir when running test_xml_etree, and enhance the findfile helper.
  ........
    r78934 | florent.xicluna | 2010-03-13 18:56:19 +0100 (sam, 13 mar 2010) | 2 lines

    Update some parts of the xml.etree documentation.
  ........
    r78937 | florent.xicluna | 2010-03-13 21:30:15 +0100 (sam, 13 mar 2010) | 3 lines

    Add the keyword argument "method=None" to the .write() method and the tostring/tostringlist functions.
    Update the function, class and method signatures, according to the new convention.
  ........
................
  r78945 | florent.xicluna | 2010-03-14 02:28:07 +0100 (dim, 14 mar 2010) | 9 lines

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

  ........
    r78944 | florent.xicluna | 2010-03-14 02:22:09 +0100 (dim, 14 mar 2010) | 2 lines

    Minor documentation updates for xml.etree.
  ........
................
  r78961 | florent.xicluna | 2010-03-14 13:31:06 +0100 (dim, 14 mar 2010) | 2 lines

  Fix an oversight in r78946 which causes failure in the subprocess module on Windows.
................
  r79033 | florent.xicluna | 2010-03-17 21:29:51 +0100 (mer, 17 mar 2010) | 17 lines

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

  ........
    r79030 | florent.xicluna | 2010-03-17 20:05:04 +0100 (mer, 17 mar 2010) | 2 lines

    Cleanup in test_import and test_coding.
  ........
    r79031 | florent.xicluna | 2010-03-17 20:15:56 +0100 (mer, 17 mar 2010) | 2 lines

    Cleanup some test cases using check_warnings and check_py3k_warnings.
  ........
    r79032 | florent.xicluna | 2010-03-17 21:05:11 +0100 (mer, 17 mar 2010) | 2 lines

    Fix and check cgi module deprecation warnings.  Revert an unwanted rename in test_import.
  ........
................
  r79050 | florent.xicluna | 2010-03-18 21:00:57 +0100 (jeu, 18 mar 2010) | 9 lines

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

  ........
    r79049 | florent.xicluna | 2010-03-18 20:51:47 +0100 (jeu, 18 mar 2010) | 2 lines

    #8155: Preserve backward compatibility for test_support.check_warnings().  Add regression tests.
  ........
................
  r79062 | florent.xicluna | 2010-03-18 23:11:01 +0100 (jeu, 18 mar 2010) | 9 lines

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

  ........
    r79059 | florent.xicluna | 2010-03-18 22:50:06 +0100 (jeu, 18 mar 2010) | 2 lines

    Issue #8024: Update the Unicode database to 5.2
  ........
................
  r79065 | florent.xicluna | 2010-03-18 23:19:01 +0100 (jeu, 18 mar 2010) | 2 lines

  Missing update from previous changeset r79062.
................
  r79083 | florent.xicluna | 2010-03-19 01:03:01 +0100 (ven, 19 mar 2010) | 2 lines

  Fix bad unicodedata checksum merge from trunk in r79062
................
  r79088 | florent.xicluna | 2010-03-19 02:17:46 +0100 (ven, 19 mar 2010) | 2 lines

  Revert Unicode UCD 5.2 upgrade in 3.x.  It broke repr() for unicode objects, and gave failures in test_bigmem.  Revert 79062, 79065 and 79083.
................
  r79093 | florent.xicluna | 2010-03-19 14:37:08 +0100 (ven, 19 mar 2010) | 11 lines

  Fixed a failure in test_bigmem.

  Merged revision 79059 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79059 | florent.xicluna | 2010-03-18 22:50:06 +0100 (jeu, 18 mar 2010) | 2 lines

    Issue #8024: Update the Unicode database to 5.2
  ........
................
  r79094 | florent.xicluna | 2010-03-19 15:25:03 +0100 (ven, 19 mar 2010) | 14 lines

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

  ........
    r78982 | florent.xicluna | 2010-03-15 15:00:58 +0100 (lun, 15 mar 2010) | 2 lines

    Remove py3k deprecation warnings from these Unicode tools.
  ........
    r78986 | florent.xicluna | 2010-03-15 19:08:58 +0100 (lun, 15 mar 2010) | 3 lines

    Issue #7783 and #7787: open_urlresource invalidates the outdated files from the local cache.
    Use this feature to fix test_normalization.
  ........
................
  r79102 | florent.xicluna | 2010-03-19 20:00:44 +0100 (ven, 19 mar 2010) | 9 lines

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

  ........
    r79100 | florent.xicluna | 2010-03-19 19:34:55 +0100 (ven, 19 mar 2010) | 2 lines

    Various tests cleanup: check_warnings/check_py3k_warnings, unittest.assert* and setUp/tearDown.
  ........
................
  r79128 | florent.xicluna | 2010-03-20 01:21:04 +0100 (sam, 20 mar 2010) | 9 lines

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

  ........
    r79127 | florent.xicluna | 2010-03-20 01:17:46 +0100 (sam, 20 mar 2010) | 2 lines

    #8178 Cleanup the threads after test_thread.TestForkInThread.
  ........
................
  r79145 | florent.xicluna | 2010-03-20 21:31:34 +0100 (sam, 20 mar 2010) | 2 lines

  Typo
................
  r79209 | florent.xicluna | 2010-03-21 19:49:50 +0100 (dim, 21 mar 2010) | 9 lines

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

  ........
    r79207 | florent.xicluna | 2010-03-21 19:00:38 +0100 (dim, 21 mar 2010) | 2 lines

    #8180: Fix test_pep277 on OS X and add more tests for special Unicode normalization cases.
  ........
................
  r79473 | florent.xicluna | 2010-03-27 23:47:23 +0100 (sam, 27 mar 2010) | 17 lines

  Merged revisions 79344,79346,79350 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79344 | florent.xicluna | 2010-03-23 15:36:45 +0100 (mar, 23 mar 2010) | 2 lines

    Silence test_subprocess.
  ........
    r79346 | florent.xicluna | 2010-03-23 16:05:30 +0100 (mar, 23 mar 2010) | 2 lines

    The standard error should be empty when the signal is killed, except on SIGINT.
  ........
    r79350 | florent.xicluna | 2010-03-23 20:19:16 +0100 (mar, 23 mar 2010) | 2 lines

    The SIGINT signal may happen earlier, during site.py initialization.
  ........
................

................
  r79456 | mark.dickinson | 2010-03-27 11:11:13 +0000 (Sat, 27 Mar 2010) | 9 lines

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

  ........
    r79455 | mark.dickinson | 2010-03-27 11:09:29 +0000 (Sat, 27 Mar 2010) | 2 lines

    Make Fraction to complex comparisons with <=, <, >= or > raise TypeError.
  ........
................
  r79458 | mark.dickinson | 2010-03-27 11:16:00 +0000 (Sat, 27 Mar 2010) | 9 lines

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

  ........
    r79457 | mark.dickinson | 2010-03-27 11:14:37 +0000 (Sat, 27 Mar 2010) | 1 line

    Add Misc/NEWS entry for r79455.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79449 | antoine.pitrou | 2010-03-26 20:32:24 +0100 (ven., 26 mars 2010) | 12 lines

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

  ........
    r79448 | antoine.pitrou | 2010-03-26 20:27:16 +0100 (ven., 26 mars 2010) | 6 lines

    Issue #8222: Enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking
    reads and writes are always retried by OpenSSL itself.

    (this is a followup to issue #3890)
  ........
................
  r79452 | antoine.pitrou | 2010-03-26 20:36:14 +0100 (ven., 26 mars 2010) | 3 lines

  Add NEWS entry for r79449.
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79434 | brian.curtin | 2010-03-25 19:39:56 -0500 (Thu, 25 Mar 2010) | 9 lines

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

  ........
    r79430 | brian.curtin | 2010-03-25 18:48:54 -0500 (Thu, 25 Mar 2010) | 2 lines

    Fix #6538. Markup RegexObject and MatchObject as classes. Patch by Ryan Arana.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79420 | victor.stinner | 2010-03-25 13:24:38 +0100 (jeu., 25 mars 2010) | 10 lines

  Fix my test introduced in test_sys by r79394:

  Restore the orginal filesystem encoding before testing
  assertRaises(LookupError, sys.setfilesystemencoding, "xxx"). Unittest formats
  the exception, but the formatting failed because the file system was invalid
  (set to iso-8859-1 by the previous test).

  Anyway, ensure to restore the original filesystem encoding when exiting
  test_setfilesystemencoding() to avoid error propagation to the other tests.
........

................
  r79401 | victor.stinner | 2010-03-25 02:02:29 +0100 (jeu., 25 mars 2010) | 10 lines

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

  ........
    r79392 | victor.stinner | 2010-03-25 01:21:53 +0100 (jeu., 25 mars 2010) | 3 lines

    Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, compiler
    optimizations are disabled when --with-pydebug is used.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79398 | victor.stinner | 2010-03-25 01:55:12 +0100 (jeu., 25 mars 2010) | 12 lines

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

  ........
    r79395 | victor.stinner | 2010-03-25 01:51:58 +0100 (jeu., 25 mars 2010) | 5 lines

    Fix _curses.tiget*() functions: deny None to avoid a crash.

    Fix the following calls: _curses.tigetflag(None), _curses.tigetnum(None),
    _curses.tigetstr(None).
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79393 | victor.stinner | 2010-03-25 01:30:28 +0100 (jeu., 25 mars 2010) | 3 lines

  Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding
  is unknown.
........

................
  r79389 | steven.bethard | 2010-03-24 16:07:31 -0700 (Wed, 24 Mar 2010) | 9 lines

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

  ........
    r79388 | steven.bethard | 2010-03-24 16:03:24 -0700 (Wed, 24 Mar 2010) | 1 line

    Replace license with simple attribution.
  ........
................

........
  r79368 | r.david.murray | 2010-03-23 20:29:21 -0400 (Tue, 23 Mar 2010) | 2 lines

  Fix porting mistake in r79298.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79364 | ezio.melotti | 2010-03-24 01:56:06 +0200 (Wed, 24 Mar 2010) | 9 lines

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

  ........
    r79362 | ezio.melotti | 2010-03-24 01:53:20 +0200 (Wed, 24 Mar 2010) | 1 line

    Another typo.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79360 | ezio.melotti | 2010-03-24 01:29:39 +0200 (Wed, 24 Mar 2010) | 9 lines

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

  ........
    r79358 | ezio.melotti | 2010-03-24 01:26:21 +0200 (Wed, 24 Mar 2010) | 1 line

    #8217: typo.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79352 | benjamin.peterson | 2010-03-23 16:02:34 -0500 (Tue, 23 Mar 2010) | 9 lines

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

  ........
    r79351 | benjamin.peterson | 2010-03-23 15:58:37 -0500 (Tue, 23 Mar 2010) | 1 line

    the == test doesn't work on Solaris #8210
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78901 | ezio.melotti | 2010-03-13 06:42:07 +0200 (Sat, 13 Mar 2010) | 9 lines

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

  ........
    r78900 | ezio.melotti | 2010-03-13 06:39:51 +0200 (Sat, 13 Mar 2010) | 1 line

    Silence compiler warnings.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r76197 | benjamin.peterson | 2009-11-10 22:23:15 +0100 (mar., 10 nov. 2009) | 1 line

  death to compiler warning
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79327 | benjamin.peterson | 2010-03-22 22:22:05 -0500 (Mon, 22 Mar 2010) | 54 lines

  Merged revisions 79306,79311,79325 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ................
    r79306 | benjamin.peterson | 2010-03-22 17:40:06 -0500 (Mon, 22 Mar 2010) | 21 lines

    Merged revisions 79077,79137,79304-79305 via svnmerge from
    svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

    ........
      r79077 | benjamin.peterson | 2010-03-18 18:05:29 -0500 (Thu, 18 Mar 2010) | 1 line

      port detect_encoding improvements from py3k
    ........
      r79137 | benjamin.peterson | 2010-03-20 11:12:53 -0500 (Sat, 20 Mar 2010) | 1 line

      add a fixer for setting sys.exitfunc #2356
    ........
      r79304 | benjamin.peterson | 2010-03-22 17:20:22 -0500 (Mon, 22 Mar 2010) | 1 line

      fix test_parser when it's run in a path with spaces #7666
    ........
      r79305 | benjamin.peterson | 2010-03-22 17:27:07 -0500 (Mon, 22 Mar 2010) | 1 line

      normalize whitespace
    ........
  ................
    r79311 | benjamin.peterson | 2010-03-22 17:54:42 -0500 (Mon, 22 Mar 2010) | 9 lines

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

    ........
      r79309 | benjamin.peterson | 2010-03-22 17:50:47 -0500 (Mon, 22 Mar 2010) | 1 line

      pass correct symbol in
    ........
  ................
    r79325 | benjamin.peterson | 2010-03-22 22:03:55 -0500 (Mon, 22 Mar 2010) | 13 lines

    Merged revisions 79313,79324 via svnmerge from
    svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

    ........
      r79313 | benjamin.peterson | 2010-03-22 17:59:57 -0500 (Mon, 22 Mar 2010) | 1 line

      another case where a symbol is needed
    ........
      r79324 | benjamin.peterson | 2010-03-22 21:59:47 -0500 (Mon, 22 Mar 2010) | 1 line

      use unicode literals
    ........
  ................
................

................
  r79298 | r.david.murray | 2010-03-22 13:48:48 -0400 (Mon, 22 Mar 2010) | 11 lines

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

  ........
    r79294 | r.david.murray | 2010-03-22 11:55:09 -0400 (Mon, 22 Mar 2010) | 4 lines

    Issue #7860: platform.uname now reports the correct 'machine' type
    when Python is running in WOW64 mode on 64 bit Windows.  Patch by
    Brian Curtin.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79317 | antoine.pitrou | 2010-03-23 01:25:54 +0100 (mar., 23 mars 2010) | 5 lines

  Issue #8139: ossaudiodev didn't initialize its types properly, therefore
  some methods (such as oss_mixer_device.fileno()) were not available.
  Initial patch by Bertrand Janin.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79301 | antoine.pitrou | 2010-03-22 21:11:09 +0100 (lun., 22 mars 2010) | 11 lines

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

  ........
    r79299 | antoine.pitrou | 2010-03-22 20:59:46 +0100 (lun., 22 mars 2010) | 5 lines

    Issue #7512: shutil.copystat() could raise an OSError when the filesystem
    didn't support chflags() (for example ZFS under FreeBSD).  The error is
    now silenced.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79287 | antoine.pitrou | 2010-03-22 15:49:10 +0100 (lun., 22 mars 2010) | 13 lines

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

  ........
    r79226 | antoine.pitrou | 2010-03-21 20:33:38 +0100 (dim., 21 mars 2010) | 4 lines

    Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
  ........
    r79286 | antoine.pitrou | 2010-03-22 15:41:48 +0100 (lun., 22 mars 2010) | 3 lines

    Fix an occasional test_ftplib failure, following r79226.
  ........
................
  r79289 | antoine.pitrou | 2010-03-22 16:07:09 +0100 (lun., 22 mars 2010) | 3 lines

  Fix a blunder in r79287.  This part is, obviously, poorly tested (if at all).
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79281 | victor.stinner | 2010-03-22 13:50:40 +0100 (lun., 22 mars 2010) | 16 lines

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

  ........
    r79278 | victor.stinner | 2010-03-22 13:24:37 +0100 (lun., 22 mars 2010) | 2 lines

    Issue #1583863: An unicode subclass can now override the __str__ method
  ........
    r79280 | victor.stinner | 2010-03-22 13:36:28 +0100 (lun., 22 mars 2010) | 5 lines

    Fix the NEWS about my last commit: an unicode subclass can now override the
    __unicode__ method (and not the __str__ method).

    Simplify also the testcase.
  ........
................

Python 3.1 doesn't support unicode events.

........
  r79276 | victor.stinner | 2010-03-22 13:11:44 +0100 (lun., 22 mars 2010) | 7 lines

  Fix a crash in _elementtree related to lone unicode surrogates.

  Fix a segfault on:

     >>> import _elementtree
     >>> _elementtree.iterparse('/bin/sh', ("\uDC80", "\ud808\udf45"))
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79271 | victor.stinner | 2010-03-22 02:58:35 +0100 (lun., 22 mars 2010) | 4 lines

  Issue #4282: Fix the main function of the profile module for a non-ASCII
  script, open the file in binary mode and not in text mode with the default
  (utf8) encoding.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79260 | benjamin.peterson | 2010-03-21 18:17:57 -0500 (Sun, 21 Mar 2010) | 13 lines

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

  ........
    r79138 | benjamin.peterson | 2010-03-20 11:16:44 -0500 (Sat, 20 Mar 2010) | 1 line

    document exitfunc fixer
  ........
    r79139 | benjamin.peterson | 2010-03-20 11:17:37 -0500 (Sat, 20 Mar 2010) | 1 line

    wrap
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78991 | martin.v.loewis | 2010-03-16 12:03:13 +0100 (Di, 16 Mär 2010) | 9 lines

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

  ........
    r78976 | martin.v.loewis | 2010-03-15 14:00:17 +0100 (Mo, 15 Mär 2010) | 1 line

    Issue #6716: Quote -x arguments of compileall in MSI installer.
  ........
................
  r78992 | martin.v.loewis | 2010-03-16 14:19:21 +0100 (Di, 16 Mär 2010) | 2 lines

  Issue #6716/2: Backslash-replace error output in compilall.
................
  r78994 | martin.v.loewis | 2010-03-16 17:19:47 +0100 (Di, 16 Mär 2010) | 1 line

  Issue #6716/3: Exclude 2to3 tests from compileall.
................

as I did for 2.6. But fix the other bugs :-)

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78872 | victor.stinner | 2010-03-12 15:45:56 +0100 (ven., 12 mars 2010) | 12 lines

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

  ........
    r78826 | victor.stinner | 2010-03-10 23:30:19 +0100 (mer., 10 mars 2010) | 5 lines

    Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt
    (SIGINT). If an error occurs while importing the site module, the error is
    printed and Python exits. Initialize the GIL before importing the site
    module.
  ........
................

................
  r77840 | victor.stinner | 2010-01-30 03:30:00 +0100 (sam., 30 janv. 2010) | 10 lines

  Blocked revisions 77836 via svnmerge

  ........
    r77836 | victor.stinner | 2010-01-30 03:00:26 +0100 (sam., 30 janv. 2010) | 2 lines

    #7801: fix xmlrpclib binary example, open the picture in binary mode
  ........

  I wrote a different patch for the py3k (r77838).
................
  r77894 | victor.stinner | 2010-01-31 23:34:52 +0100 (dim., 31 janv. 2010) | 10 lines

  Blocked revisions 77892 via svnmerge

  ........
    r77892 | victor.stinner | 2010-01-31 23:32:15 +0100 (dim., 31 janv. 2010) | 4 lines

    Issue #7819: Check sys.call_tracing() arguments types.

    py3k was already patched by issue #3661.
  ........
................
  r78871 | victor.stinner | 2010-03-12 15:31:06 +0100 (ven., 12 mars 2010) | 8 lines

  Blocked revisions 78870 via svnmerge

  ........
    r78870 | victor.stinner | 2010-03-12 15:30:26 +0100 (ven., 12 mars 2010) | 1 line

    NEWS: issue #7774 is related to Library (sys), not Core and Builtins
  ........
................
  r78873 | victor.stinner | 2010-03-12 15:47:28 +0100 (ven., 12 mars 2010) | 10 lines

  Blocked revisions 78827 via svnmerge

  ........
    r78827 | victor.stinner | 2010-03-10 23:45:04 +0100 (mer., 10 mars 2010) | 4 lines

    ooops, fix error message in execusercustomize()

    Copy/paste failure :-)
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78876 | victor.stinner | 2010-03-12 18:17:58 +0100 (ven., 12 mars 2010) | 3 lines

  Issue #6697: catch _PyUnicode_AsString() errors in getattr() and setattr()
  builtin functions.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78875 | victor.stinner | 2010-03-12 18:00:41 +0100 (ven., 12 mars 2010) | 5 lines

  Issue #6697: use %U format instead of _PyUnicode_AsString(), because
  _PyUnicode_AsString() was not checked for error (NULL).

  The unicode string is no more truncated to 200 or 400 *bytes*.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78868 | victor.stinner | 2010-03-12 15:20:59 +0100 (ven., 12 mars 2010) | 25 lines

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

  ........
    r78835 | victor.stinner | 2010-03-11 13:34:39 +0100 (jeu., 11 mars 2010) | 7 lines

    Issue #7774: Set sys.executable to an empty string if argv[0] has been
    set to an non existent program name and Python is unable to retrieve the real
    program name.

    Fix also sysconfig: if sys.executable is an empty string, use the current
    working directory.
  ........
    r78836 | victor.stinner | 2010-03-11 14:27:35 +0100 (jeu., 11 mars 2010) | 4 lines

    Fix test_executable introduce in previous commit (r78835): Windows is able to
    retrieve the absolute Python path even if argv[0] has been set to a non
    existent program name.
  ........
    r78837 | victor.stinner | 2010-03-11 14:46:06 +0100 (jeu., 11 mars 2010) | 3 lines

    Another fix to test_executable() of test_sys: set the current working to avoid
    the #7774 bug.
  ........
................
  r78869 | victor.stinner | 2010-03-12 15:27:16 +0100 (ven., 12 mars 2010) | 2 lines

  Oops, I loose the NEWS change in my previous backport (r78868) of r78835.
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78899 | victor.stinner | 2010-03-13 04:28:34 +0100 (sam., 13 mars 2010) | 14 lines

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

  ........
    r78898 | victor.stinner | 2010-03-13 04:27:07 +0100 (sam., 13 mars 2010) | 7 lines

    sqlite3: Fix a segfault on calling a connection with something else than a
    string. Initialize all attributes to be able to call the statement destructor
    on error.

    Avoid also a duplicate connection in some tests: setUp() does already open a
    connection (":memory:").
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78894 | victor.stinner | 2010-03-13 01:57:22 +0100 (sam., 13 mars 2010) | 4 lines

  sqlite3: Fix _PyUnicode_AsStringAndSize() error handler.

  Destroy begin_statement (not statement) on error.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79221 | antoine.pitrou | 2010-03-21 20:25:26 +0100 (dim., 21 mars 2010) | 11 lines

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

  ........
    r79218 | antoine.pitrou | 2010-03-21 20:19:41 +0100 (dim., 21 mars 2010) | 5 lines

    Issue #1628484: The Makefile doesn't ignore the CFLAGS environment
    variable anymore.  It also forwards the LDFLAGS settings to the linker
    when building a shared library.
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79161 | antoine.pitrou | 2010-03-21 01:22:55 +0100 (dim., 21 mars 2010) | 9 lines

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

  ........
    r79160 | antoine.pitrou | 2010-03-21 01:21:43 +0100 (dim., 21 mars 2010) | 3 lines

    Fix overzealous .hgignore file
  ........
................

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r77888 | georg.brandl | 2010-01-31 20:53:23 +0200 (Sun, 31 Jan 2010) | 1 line

  Fix versionadded:: 2.x merges.
........