Commit Graph

42642 Commits

Author SHA1 Message Date
Ezio Melotti 35099daee0 Try to avoid failures on the buildbot. 2010-08-03 04:50:52 +00:00
Ezio Melotti d24b5d8fc7 Merged revisions 79187-79189 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79187 | florent.xicluna | 2010-03-21 12:50:44 +0200 (Sun, 21 Mar 2010) | 2 lines

  Silence more py3k warnings in unittest.case.
........
  r79188 | florent.xicluna | 2010-03-21 12:51:40 +0200 (Sun, 21 Mar 2010) | 2 lines

  Fix py3k warnings in test_decimal, using unittest.assertItemsEqual.
........
  r79189 | florent.xicluna | 2010-03-21 13:03:21 +0200 (Sun, 21 Mar 2010) | 2 lines

  Silence some py3k SyntaxWarning using check_py3k_warnings() with "exec" statements.
........
2010-08-03 04:08:59 +00:00
Ezio Melotti 620f5c91d7 Unblocked revisions 79187-79189 via svnmerge
........
  r79187 | florent.xicluna | 2010-03-21 12:50:44 +0200 (Sun, 21 Mar 2010) | 2 lines

  Silence more py3k warnings in unittest.case.
........
  r79188 | florent.xicluna | 2010-03-21 12:51:40 +0200 (Sun, 21 Mar 2010) | 2 lines

  Fix py3k warnings in test_decimal, using unittest.assertItemsEqual.
........
  r79189 | florent.xicluna | 2010-03-21 13:03:21 +0200 (Sun, 21 Mar 2010) | 2 lines

  Silence some py3k SyntaxWarning using check_py3k_warnings() with "exec" statements.
........
2010-08-03 03:31:32 +00:00
Ezio Melotti 262a47d2b9 Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75407 | antoine.pitrou | 2009-10-14 20:30:52 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in the aifc module
........
  r75409 | antoine.pitrou | 2009-10-14 21:01:33 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in bsddb
........
  r75410 | antoine.pitrou | 2009-10-14 21:09:45 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence a py3k warning claiming to affect Lib/calendar.py
........
  r75411 | antoine.pitrou | 2009-10-14 21:12:54 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix a py3k warning in the StringIO module (exhibited in test_codecencodings_cn)
........
  r75412 | antoine.pitrou | 2009-10-14 21:27:32 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in the socket module
........
  r75413 | antoine.pitrou | 2009-10-14 21:31:05 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix a py3k warning in the sndhdr module (found with test_email)
........
  r75415 | antoine.pitrou | 2009-10-14 21:39:46 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence some py3k warnings claiming to affect _pyio
........
  r75419 | antoine.pitrou | 2009-10-14 21:56:11 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence py3k warning claiming to affect the random module
........
  r75420 | antoine.pitrou | 2009-10-14 22:04:48 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in httplib
........
  r75421 | antoine.pitrou | 2009-10-14 22:09:48 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in the uuid module
........
2010-08-03 03:19:00 +00:00
Ezio Melotti efcdd8494a Unblocked revisions 75407,75409-75413,75415,75419-75421 via svnmerge
........
  r75407 | antoine.pitrou | 2009-10-14 20:30:52 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in the aifc module
........
  r75409 | antoine.pitrou | 2009-10-14 21:01:33 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in bsddb
........
  r75410 | antoine.pitrou | 2009-10-14 21:09:45 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence a py3k warning claiming to affect Lib/calendar.py
........
  r75411 | antoine.pitrou | 2009-10-14 21:12:54 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix a py3k warning in the StringIO module (exhibited in test_codecencodings_cn)
........
  r75412 | antoine.pitrou | 2009-10-14 21:27:32 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in the socket module
........
  r75413 | antoine.pitrou | 2009-10-14 21:31:05 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix a py3k warning in the sndhdr module (found with test_email)
........
  r75415 | antoine.pitrou | 2009-10-14 21:39:46 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence some py3k warnings claiming to affect _pyio
........
  r75419 | antoine.pitrou | 2009-10-14 21:56:11 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence py3k warning claiming to affect the random module
........
  r75420 | antoine.pitrou | 2009-10-14 22:04:48 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in httplib
........
  r75421 | antoine.pitrou | 2009-10-14 22:09:48 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix py3k warnings in the uuid module
........
2010-08-03 02:20:23 +00:00
Ezio Melotti edb3512543 Remove the check_warnings. The mkarg warning is raised only with -3 and check_warning fails if the error is not raised. 2010-08-03 00:52:46 +00:00
Ezio Melotti 7b688250d1 Fix a couple more tests. 2010-08-03 00:18:09 +00:00
Ezio Melotti 6a19b00668 Fix test_recno. 2010-08-02 23:39:23 +00:00
Ezio Melotti 1d55ec329a Merged revisions 79539 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79539 | florent.xicluna | 2010-04-01 01:01:03 +0300 (Thu, 01 Apr 2010) | 2 lines

  Replace catch_warnings with check_warnings when it makes sense.  Use assertRaises context manager to simplify some tests.
........
2010-08-02 23:34:49 +00:00
Ezio Melotti cc436eb6e8 Merged revisions 78769,79049 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78769 | florent.xicluna | 2010-03-07 21:14:12 +0200 (Sun, 07 Mar 2010) | 2 lines

  Refresh the documentation for the test.test_support module.
........
  r79049 | florent.xicluna | 2010-03-18 21:51:47 +0200 (Thu, 18 Mar 2010) | 2 lines

  #8155: Preserve backward compatibility for test_support.check_warnings().  Add regression tests.
........
2010-08-02 22:01:34 +00:00
Ezio Melotti c355eaa9a9 Unblocked revisions 78769 via svnmerge
........
  r78769 | florent.xicluna | 2010-03-07 21:14:12 +0200 (Sun, 07 Mar 2010) | 2 lines

  Refresh the documentation for the test.test_support module.
........
2010-08-02 21:56:44 +00:00
Ezio Melotti 15a5400eb1 Blocked revisions 78814 via svnmerge
........
  r78814 | raymond.hettinger | 2010-03-09 13:29:10 +0200 (Tue, 09 Mar 2010) | 1 line

  Improve code clarity a bit.
........
2010-08-02 21:55:32 +00:00
Ezio Melotti 6dc97b2076 Unblocked revisions 78814,79049 via svnmerge
........
  r78814 | raymond.hettinger | 2010-03-09 13:29:10 +0200 (Tue, 09 Mar 2010) | 1 line

  Improve code clarity a bit.
........
  r79049 | florent.xicluna | 2010-03-18 21:51:47 +0200 (Thu, 18 Mar 2010) | 2 lines

  #8155: Preserve backward compatibility for test_support.check_warnings().  Add regression tests.
........
2010-08-02 21:53:39 +00:00
Ezio Melotti f9c2f4f399 Merged revisions 78815 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78815 | florent.xicluna | 2010-03-09 21:57:01 +0200 (Tue, 09 Mar 2010) | 2 lines

  #7772: Fix test_py3kwarn. Now the test suite could pass with "-3" flag.
........
2010-08-02 21:48:39 +00:00
Georg Brandl 51449f5346 Merged revisions 83567 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83567 | georg.brandl | 2010-08-02 22:32:03 +0200 (Mo, 02 Aug 2010) | 9 lines

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

  ........
    r83552 | georg.brandl | 2010-08-02 21:36:36 +0200 (Mo, 02 Aug 2010) | 1 line

    #9438: clarify that constant names also cannot be assigned as attributes.
  ........
................
2010-08-02 21:47:02 +00:00
Georg Brandl 0771591fe1 Merged revisions 83593 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83593 | georg.brandl | 2010-08-02 23:44:25 +0200 (Mo, 02 Aug 2010) | 57 lines

  Merged revisions 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line

    #8578: mention danger of not incref'ing weak referenced object.
  ........
    r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line

    #7973: Fix distutils options spelling.
  ........
    r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line

    #7386: add example that shows that trailing path separators are stripped.
  ........
    r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line

    #8172: how does one use a property?
  ........
    r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line

    #9451: strengthen warning about __*__ special name usage.
  ........
    r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line

    #7280: note about nasmw.exe.
  ........
    r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line

    #8861: remove unused variable.
  ........
    r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line

    #8648: document UTF-7 codec functions.
  ........
    r83563 | georg.brandl | 2010-08-02 22:21:21 +0200 (Mo, 02 Aug 2010) | 1 line

    #9037: add example how to raise custom exceptions from C code.
  ........
    r83565 | georg.brandl | 2010-08-02 22:27:20 +0200 (Mo, 02 Aug 2010) | 1 line

    #9111: document that do_help() looks at docstrings.
  ........
    r83571 | georg.brandl | 2010-08-02 22:44:34 +0200 (Mo, 02 Aug 2010) | 1 line

    Clarify that abs() is not a namespace.
  ........
    r83574 | georg.brandl | 2010-08-02 22:47:56 +0200 (Mo, 02 Aug 2010) | 1 line

    #6867: epoll.register() returns None.
  ........
    r83575 | georg.brandl | 2010-08-02 22:52:10 +0200 (Mo, 02 Aug 2010) | 1 line

    #9238: zipfile does handle archive comments.
  ........
................
2010-08-02 21:45:43 +00:00
Ezio Melotti f287d640ad Unblocked revisions 78815 via svnmerge
........
  r78815 | florent.xicluna | 2010-03-09 21:57:01 +0200 (Tue, 09 Mar 2010) | 2 lines

  #7772: Fix test_py3kwarn. Now the test suite could pass with "-3" flag.
........
2010-08-02 21:40:56 +00:00
Ezio Melotti 26dfaacdda Merged revisions 78757 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78757 | florent.xicluna | 2010-03-07 14:14:25 +0200 (Sun, 07 Mar 2010) | 2 lines

  Fix some py3k warnings in the standard library.
........
2010-08-02 21:35:06 +00:00
Ezio Melotti 1c9972e6dd Unblocked revisions 78757 via svnmerge
........
  r78757 | florent.xicluna | 2010-03-07 14:14:25 +0200 (Sun, 07 Mar 2010) | 2 lines

  Fix some py3k warnings in the standard library.
........
2010-08-02 21:23:45 +00:00
Ezio Melotti 81b7cc283d Blocked revisions 75415 via svnmerge
........
  r75415 | antoine.pitrou | 2009-10-14 21:39:46 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence some py3k warnings claiming to affect _pyio
........
2010-08-02 21:23:16 +00:00
Ezio Melotti 5b83a99464 Unblocked revisions 75415 via svnmerge
........
  r75415 | antoine.pitrou | 2009-10-14 21:39:46 +0300 (Wed, 14 Oct 2009) | 3 lines

  Silence some py3k warnings claiming to affect _pyio
........
2010-08-02 21:06:44 +00:00
Ezio Melotti f0c2ca267f Merged revisions 75417 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75417 | antoine.pitrou | 2009-10-14 21:47:13 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix failures in test_profilehooks when run with -3
........
2010-08-02 21:05:39 +00:00
Ezio Melotti 34d701fb63 Unblocked revisions 75417 via svnmerge
........
  r75417 | antoine.pitrou | 2009-10-14 21:47:13 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix failures in test_profilehooks when run with -3
........
2010-08-02 21:04:52 +00:00
Ezio Melotti d9a4e29db9 Fix test_operator. 2010-08-02 21:00:32 +00:00
Ezio Melotti c31cbbdb73 Fix test_dict. 2010-08-02 20:58:02 +00:00
Ezio Melotti 1374a3eb9c Fix test_descr. 2010-08-02 20:54:56 +00:00
Ezio Melotti fc521498bb Fix test_bool. operator.isCallable() doesn't raise a warning on 2.6. 2010-08-02 20:52:47 +00:00
Ezio Melotti 5ee50bba6b Merged revisions 75408 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75408 | antoine.pitrou | 2009-10-14 20:34:31 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix a test_atexit failure when run with -3
........
2010-08-02 20:47:06 +00:00
Ezio Melotti 589254baa4 Unblocked revisions 75408 via svnmerge
........
  r75408 | antoine.pitrou | 2009-10-14 20:34:31 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix a test_atexit failure when run with -3
........
2010-08-02 20:46:25 +00:00
Ezio Melotti 4c6daf1037 Merged revisions 79576-79578 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79576 | florent.xicluna | 2010-04-02 10:24:52 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Fix additional "-3" warnings in the idlelib package, and convert to absolute imports.
........
  r79577 | florent.xicluna | 2010-04-02 11:15:26 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Drop the cmp argument.
........
  r79578 | florent.xicluna | 2010-04-02 11:30:21 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: silence some py3k warnings
........
2010-08-02 20:40:20 +00:00
Ezio Melotti b55d368055 Merged revisions 79558 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79558 | florent.xicluna | 2010-04-01 21:17:09 +0300 (Thu, 01 Apr 2010) | 2 lines

  #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
2010-08-02 20:26:41 +00:00
Ezio Melotti 507ea2ae18 Merged revisions 77912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77912 | ezio.melotti | 2010-02-02 17:57:45 +0200 (Tue, 02 Feb 2010) | 1 line

  Fix idioms and a couple of py3k warnings. Patch by Florent Xicluna.
........
2010-08-02 20:19:21 +00:00
Ezio Melotti 8f1e0f2d9f Unblocked revisions 77912 via svnmerge
........
  r77912 | ezio.melotti | 2010-02-02 17:57:45 +0200 (Tue, 02 Feb 2010) | 1 line

  Fix idioms and a couple of py3k warnings. Patch by Florent Xicluna.
........
2010-08-02 20:06:13 +00:00
Ezio Melotti a65e2afe80 Merged revisions 79165 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines

  #7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
2010-08-02 19:56:05 +00:00
Alexander Belopolsky edabc7bca2 Issue 9264: Document trace module command line options. Patch by Eli Bendersky. 2010-08-02 19:29:03 +00:00
Ezio Melotti d3a1cda291 Unblocked revisions 79165 via svnmerge
........
  r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines

  #7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
2010-08-02 18:43:03 +00:00
Ezio Melotti 3efafd7749 Merged revisions 77942,79023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77942 | ezio.melotti | 2010-02-03 07:37:26 +0200 (Wed, 03 Feb 2010) | 1 line

  #7092: Silence more py3k warnings. Patch by Florent Xicluna.
........
  r79023 | ezio.melotti | 2010-03-17 15:52:48 +0200 (Wed, 17 Mar 2010) | 1 line

  #7092: silence some more py3k warnings.
........
2010-08-02 18:40:55 +00:00
Georg Brandl 5ff2745fed #9061: warn that single quotes are not escaped. 2010-08-02 18:30:48 +00:00
Ezio Melotti f613f352d0 Merged revisions 78758 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78758 | florent.xicluna | 2010-03-07 14:18:33 +0200 (Sun, 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.
........
2010-08-02 18:10:09 +00:00
Georg Brandl 800a354fa9 Merged revisions 83533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83533 | georg.brandl | 2010-08-02 19:34:58 +0200 (Mo, 02 Aug 2010) | 9 lines

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

  ........
    r83531 | georg.brandl | 2010-08-02 19:24:49 +0200 (Mo, 02 Aug 2010) | 1 line

    #7372: fix regression in pstats: a previous fix to handle cProfile data in add_callers broke handling of profile data.
  ........
................
2010-08-02 17:40:28 +00:00
Ezio Melotti cd1f44d7ae Unblocked revisions 78758 via svnmerge
........
  r78758 | florent.xicluna | 2010-03-07 14:18:33 +0200 (Sun, 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.
........
2010-08-02 17:31:33 +00:00
Ezio Melotti beaad5a25c Unblocked revisions 77942,79023 via svnmerge
........
  r77942 | ezio.melotti | 2010-02-03 07:37:26 +0200 (Wed, 03 Feb 2010) | 1 line

  #7092: Silence more py3k warnings. Patch by Florent Xicluna.
........
  r79023 | ezio.melotti | 2010-03-17 15:52:48 +0200 (Wed, 17 Mar 2010) | 1 line

  #7092: silence some more py3k warnings.
........
2010-08-02 05:18:32 +00:00
Ezio Melotti 4d6f56dbd4 Fix incorrect placement of sorted() 2010-08-02 04:25:50 +00:00
Ezio Melotti 38a5800cdc Merged revisions 77871,77910,77913 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77871 | ezio.melotti | 2010-01-31 13:46:54 +0200 (Sun, 31 Jan 2010) | 1 line

  #7092: silence more -3 and -Wd warnings
........
  r77910 | ezio.melotti | 2010-02-02 10:37:35 +0200 (Tue, 02 Feb 2010) | 1 line

  #7092: silence py3k warnings for bsddb. Patch by Florent Xicluna.
........
  r77913 | ezio.melotti | 2010-02-02 19:34:37 +0200 (Tue, 02 Feb 2010) | 1 line

  #7092: Silence py3k warnings in test_exceptions and test_pep352. Patch by Florent Xicluna.
........
2010-08-02 03:14:27 +00:00
Ezio Melotti 9c4fbdbc55 Unblocked revisions 77871,77910,77913 via svnmerge
........
  r77871 | ezio.melotti | 2010-01-31 13:46:54 +0200 (Sun, 31 Jan 2010) | 1 line

  #7092: silence more -3 and -Wd warnings
........
  r77910 | ezio.melotti | 2010-02-02 10:37:35 +0200 (Tue, 02 Feb 2010) | 1 line

  #7092: silence py3k warnings for bsddb. Patch by Florent Xicluna.
........
  r77913 | ezio.melotti | 2010-02-02 19:34:37 +0200 (Tue, 02 Feb 2010) | 1 line

  #7092: Silence py3k warnings in test_exceptions and test_pep352. Patch by Florent Xicluna.
........
2010-08-02 02:16:49 +00:00
Ezio Melotti 3897a44128 Merged revisions 77841 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77841 | ezio.melotti | 2010-01-30 09:22:54 +0200 (Sat, 30 Jan 2010) | 1 line

  #7092: silence py3k warnings for deprecated modules
........
2010-08-02 01:33:30 +00:00
Ezio Melotti 4db17d5215 Unblocked revisions 77841 via svnmerge
........
  r77841 | ezio.melotti | 2010-01-30 09:22:54 +0200 (Sat, 30 Jan 2010) | 1 line

  #7092: silence py3k warnings for deprecated modules
........
2010-08-02 01:17:10 +00:00
Ezio Melotti 8dc04a4dd1 Merged revisions 77310-77311 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77310 | antoine.pitrou | 2010-01-05 01:22:44 +0200 (Tue, 05 Jan 2010) | 4 lines

  Issue #7092: Fix the DeprecationWarnings emitted by the standard library
  when using the -3 flag.  Patch by Florent Xicluna.
........
  r77311 | antoine.pitrou | 2010-01-05 01:28:16 +0200 (Tue, 05 Jan 2010) | 3 lines

  Kill a couple of "<>"
........
2010-08-02 00:24:26 +00:00
Ezio Melotti 8c7fe2d6f9 Unblocked revisions 77311 via svnmerge
........
  r77311 | antoine.pitrou | 2010-01-05 01:28:16 +0200 (Tue, 05 Jan 2010) | 3 lines

  Kill a couple of "<>"
........
2010-08-02 00:06:15 +00:00
R. David Murray 9e8e508b31 Merged revisions 83508-83509 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83508 | r.david.murray | 2010-08-01 19:52:42 -0400 (Sun, 01 Aug 2010) | 9 lines

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

  ........
    r83506 | r.david.murray | 2010-08-01 19:43:28 -0400 (Sun, 01 Aug 2010) | 2 lines

    Fix ACKS alphabetization.
  ........
................
  r83509 | r.david.murray | 2010-08-01 19:53:40 -0400 (Sun, 01 Aug 2010) | 2 lines

  Fix the alphabetization fix (bad merge).
................
2010-08-01 23:57:22 +00:00