Commit Graph

43734 Commits

Author SHA1 Message Date
Georg Brandl df8e75ed5a Merge tags from 2.5. 2011-03-05 20:40:50 +01:00
Georg Brandl 6e0a8b8ab6 Add tags from the closed branches. 2011-03-05 20:38:24 +01:00
Georg Brandl ae2af38f3d Dummy-merge 2.5 branch into 2.6 branch. 2011-03-05 15:13:50 +01:00
Georg Brandl b5c93e9cad Add .hgeol file and fix newlines in the 2.6 branch. 2011-03-05 15:04:01 +01:00
Georg Brandl 6feb9003e5 Fix tag references in 2.6 branch. 2011-03-05 15:03:31 +01:00
Georg Brandl 4db2c257d6 Add .hgeol file and fix newlines in the 2.5 branch. 2011-03-05 15:02:28 +01:00
Georg Brandl 2af945cd3f Fix tag references in 2.5 branch. 2011-03-05 15:01:01 +01:00
Alexander Belopolsky 41769a7513 Merged revisions 87663 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r87663 | alexander.belopolsky | 2011-01-02 18:23:54 -0500 (Sun, 02 Jan 2011) | 13 lines

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

  ........
    r87648 | alexander.belopolsky | 2011-01-02 15:48:22 -0500 (Sun, 02 Jan 2011) | 1 line

    Issue #8013: Fixed time.asctime segfault when OS's asctime fails
  ........
    r87656 | alexander.belopolsky | 2011-01-02 17:16:10 -0500 (Sun, 02 Jan 2011) | 1 line

    Issue #8013: Fixed test
  ........
................
2011-01-02 23:26:12 +00:00
Alexander Belopolsky 893c354a55 Merged revisions 87541,87543 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r87541 | alexander.belopolsky | 2010-12-28 10:47:56 -0500 (Tue, 28 Dec 2010) | 9 lines

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

  ........
    r87442 | alexander.belopolsky | 2010-12-22 21:27:37 -0500 (Wed, 22 Dec 2010) | 1 line

    Issue #10254: Fixed a crash and a regression introduced by the implementation of PRI 29.
  ........
................
  r87543 | alexander.belopolsky | 2010-12-28 11:04:06 -0500 (Tue, 28 Dec 2010) | 1 line

  fixed issue 10254 test
................
2010-12-28 16:15:08 +00:00
Giampaolo Rodolà 8497f0a85d backporting security fix of issue 9129 (smtpd module vulnerable to DoS attacks in case of connection bashing) 2010-12-07 18:54:43 +00:00
Matthias Klose b7180a89b3 Merge r82494 from the python2.6 branch:
Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
  ensure that the input string length is a multiple of the frame size
2010-10-17 10:48:14 +00:00
Matthias Klose d4367c24cd Merge r81080 from the python2.6 branch:
Issue #8674: fix another bogus overflow check in audioop module.
2010-10-17 10:34:40 +00:00
Matthias Klose 192b714f92 Merged revisions 81046 from the python2.6 branch:
Issue #8674: Fix incorrect and UB-inducing overflow checks in audioop
module.  Thanks Tomas Hoger for the patch.
2010-10-17 10:28:49 +00:00
Barry Warsaw 1740947952 Post release bump 2010-08-24 16:19:58 +00:00
Barry Warsaw e25ad5ec43 Tagging 2.6.6 final. 2010-08-23 23:41:00 +00:00
Barry Warsaw d724296fc3 2.6.6 final. \o/ 2010-08-23 23:37:56 +00:00
Barry Warsaw 8275da3f6a Post release twiddling. 2010-08-17 19:57:29 +00:00
Barry Warsaw 8b5724fdcb (Re-)tagging 2.6.6rc2. 2010-08-16 22:58:41 +00:00
Barry Warsaw a7077c865d Move NEWS file entry. 2010-08-16 22:58:18 +00:00
Barry Warsaw 841f7ed052 Remove tag for NEWS file fix. 2010-08-16 22:58:03 +00:00
Barry Warsaw 69e266c9f1 Tagging 2.6.6rc2 2010-08-16 22:47:52 +00:00
Barry Warsaw 607a2e3f6d Bumping to 2.6.6rc2. 2010-08-16 22:19:57 +00:00
Barry Warsaw b828e5c957 Issue 9568: Fix test_urllib2_localnet on OS X 10.3. 2010-08-16 19:33:51 +00:00
Florent Xicluna 29a66bdcb5 Merged revisions 84100 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r84100 | florent.xicluna | 2010-08-16 21:22:18 +0200 (lun., 16 août 2010) | 13 lines

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

  ........
    r84097 | florent.xicluna | 2010-08-16 20:41:19 +0200 (lun., 16 août 2010) | 1 line

    Use test.support and unittest features.  Fix duplicated test (bad merge in r79033).  Fix comment for issue #7902.
  ........
    r84099 | florent.xicluna | 2010-08-16 21:03:05 +0200 (lun., 16 août 2010) | 1 line

    I get it wrong in r84097: s/relative/absolute/
  ........
................
2010-08-16 19:26:54 +00:00
Florent Xicluna 0261d2e361 Merged revisions 82529 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82529 | florent.xicluna | 2010-07-04 16:24:40 +0200 (dim., 04 juil. 2010) | 1 line

  Issue #9145: Fix a regression due to r79539
........
2010-08-16 16:08:12 +00:00
Brian Curtin 7c251bbd6e Fix #9600. Don't use relative imports for _multiprocessing on Windows.
Same fix as #9513 on 3.x.
2010-08-14 17:09:55 +00:00
Éric Araujo 77cb7ed40e Revert regression from r81256 (with release manager approval, see #8688) 2010-08-14 02:07:26 +00:00
Mark Dickinson aa6a939d33 Issue #8433: Fix test_curses failure caused by newer versions of
ncurses returning ERR from getmouse() when there are no mouse events
available.
2010-08-13 07:57:29 +00:00
Giampaolo Rodolà 5b07f3cbfc (issue 2944) reverting r83704 changes as per Barry Warsaw request 2010-08-13 01:30:39 +00:00
Florent Xicluna 6980342c34 Rolled back revisions 81259,81265 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

(due to 2.6.6 release candidate freeze)
2010-08-12 22:39:08 +00:00
Ezio Melotti 66983a09d3 Add NEWS entry for r83964. 2010-08-12 17:49:01 +00:00
Ezio Melotti b833fa88d3 #9543: Fix regression introduced in r83624. 2010-08-12 17:29:24 +00:00
Florent Xicluna 13bc24b4a4 TestCase.skipTest is not defined in Python 2.6 2010-08-11 00:19:53 +00:00
Florent Xicluna 935f09aea1 Blocked revisions 83902,83907 via svnmerge
................
  r83902 | florent.xicluna | 2010-08-09 22:02:00 +0200 (lun., 09 août 2010) | 25 lines

  Merged revisions 83833,83838-83839,83859,83878 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83833 | florent.xicluna | 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) | 2 lines

    Add test case for the HTTPResponse being an iterable.  Follow-up of issue #4608.
  ........
    r83838 | florent.xicluna | 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) | 2 lines

    Typo.
  ........
    r83839 | florent.xicluna | 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) | 2 lines

    Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
  ........
    r83859 | florent.xicluna | 2010-08-09 00:07:16 +0200 (lun., 09 août 2010) | 2 lines

    Fix #8530: Prevent stringlib fastsearch from reading beyond the front of an array.
  ........
    r83878 | florent.xicluna | 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) | 1 line

    Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
  ........
................
  r83907 | florent.xicluna | 2010-08-09 22:29:44 +0200 (lun., 09 août 2010) | 27 lines

  Missed the svnmerge property on r83902.

  Recorded merge of revisions 83833,83838-83839,83859,83878 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83833 | florent.xicluna | 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) | 2 lines

    Add test case for the HTTPResponse being an iterable.  Follow-up of issue #4608.
  ........
    r83838 | florent.xicluna | 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) | 2 lines

    Typo.
  ........
    r83839 | florent.xicluna | 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) | 2 lines

    Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
  ........
    r83859 | florent.xicluna | 2010-08-09 00:07:16 +0200 (lun., 09 août 2010) | 2 lines

    Fix #8530: Prevent stringlib fastsearch from reading beyond the front of an array.
  ........
    r83878 | florent.xicluna | 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) | 1 line

    Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
  ........
................
2010-08-09 22:15:51 +00:00
Florent Xicluna ca2a48f773 Blocked revisions 79534,79537,79606,80411-80412,81140-81141,81149-81151,82056 via svnmerge
........
  r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer., 31 mars 2010) | 2 lines

  Fix test for xml.etree when using a non-ascii path.  And use check_warnings instead of catch_warnings.
........
  r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer., 31 mars 2010) | 2 lines

  Fix typo
........
  r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven., 02 avril 2010) | 2 lines

  Backport some robotparser test and skip the test if the external resource is not available.
........
  r80411 | florent.xicluna | 2010-04-23 19:59:10 +0200 (ven., 23 avril 2010) | 2 lines

  Remove ImportWarnings filters.  They become obsolete after r79310, issue #8205.
........
  r80412 | florent.xicluna | 2010-04-23 20:10:12 +0200 (ven., 23 avril 2010) | 2 lines

  Fix the "regrtest -s" switch.
........
  r81140 | florent.xicluna | 2010-05-13 19:05:29 +0200 (jeu., 13 mai 2010) | 3 lines

  Add sensible information about the OS X platform to diagnose issue #8423:
  test_pep277 fails on "x86 Tiger" buildbot but not on "PPC Tiger".
........
  r81141 | florent.xicluna | 2010-05-13 20:16:06 +0200 (jeu., 13 mai 2010) | 2 lines

  Revert the additional OS X information (r81140).  Keep the endianness information.
........
  r81149 | florent.xicluna | 2010-05-13 23:40:01 +0200 (jeu., 13 mai 2010) | 2 lines

  Better test skipping, with message in the log.
........
  r81150 | florent.xicluna | 2010-05-13 23:41:05 +0200 (jeu., 13 mai 2010) | 2 lines

  Improve test feedback to troubleshoot issue #8423 on OS X.
........
  r81151 | florent.xicluna | 2010-05-14 01:46:48 +0200 (ven., 14 mai 2010) | 2 lines

  Revert changeset r81150 which helped diagnose issue #8423 on some OS X buildbot.
........
  r82056 | florent.xicluna | 2010-06-17 22:30:56 +0200 (jeu., 17 juin 2010) | 2 lines

  Add few words about test.test_genericpath.CommonTest
........
2010-08-09 22:13:22 +00:00
Florent Xicluna 1c24592b92 Merged revisions 81053,81259,81265 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81053 | florent.xicluna | 2010-05-10 21:59:22 +0200 (lun., 10 mai 2010) | 2 lines

  Add a link on maketrans().
........
  r81259 | florent.xicluna | 2010-05-17 12:39:07 +0200 (lun., 17 mai 2010) | 2 lines

  Slight style cleanup.
........
  r81265 | florent.xicluna | 2010-05-17 15:35:09 +0200 (lun., 17 mai 2010) | 2 lines

  Issue #1285086: Speed up urllib.quote and urllib.unquote for simple cases.
........
2010-08-09 22:05:50 +00:00
Matthias Klose 9b83dbe905 Merged revisions 83306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r83306 | matthias.klose | 2010-07-30 23:27:18 +0200 (Fr, 30 Jul 2010) | 2 lines

  - Issue #7567: Don't call `setupterm' twice.
........
2010-08-05 16:35:53 +00:00
Barry Warsaw 498323eec7 Post 2.6.6rc1 2010-08-04 22:30:09 +00:00
Martin v. Löwis b8f5e31a7d Issue #8241: Avoid compiling py2_test_grammar. 2010-08-04 15:47:24 +00:00
Martin v. Löwis 1ad1ee912c Add UUIDs for 2.6.6. 2010-08-04 15:46:17 +00:00
Mark Dickinson f34e396b18 Issue #5798: Handle select.poll flag oddities properly on OS X.
This fixes test_asynchat and test_smtplib failures on OS X.
(Backport of r73182 from trunk.)
2010-08-04 14:42:13 +00:00
Giampaolo Rodolà 042cf1ae8c Merged revisions 83703 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r83703 | giampaolo.rodola | 2010-08-04 10:35:25 +0200 (mer, 04 ago 2010) | 1 line

  fix issue #2944: asyncore doesn't handle connection refused correctly (patch by Alexander Shigin)
........
2010-08-04 08:58:38 +00:00
Barry Warsaw dba50788a7 Tagging 2.6.6 rc 1 2010-08-03 22:51:57 +00:00
Barry Warsaw 6053744c3a Bumping to 2.6.6 rc 1 2010-08-03 22:39:42 +00:00
Mark Dickinson 6f09ea8937 - Issue #8447: Make distutils.sysconfig follow symlinks in the path to
the interpreter executable.  This fixes a failure of test_httpservers
  on OS X.
2010-08-03 21:18:06 +00:00
Ezio Melotti 1df21e7e03 Run test_py3kwarn first to avoid failures with -3. 2010-08-03 19:43:08 +00:00
Mark Dickinson c1ef2fa45f Merged revisions 83680,83685 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83680 | mark.dickinson | 2010-08-03 19:34:53 +0100 (Tue, 03 Aug 2010) | 9 lines

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

  ........
    r83677 | mark.dickinson | 2010-08-03 19:31:54 +0100 (Tue, 03 Aug 2010) | 1 line

    Fix memory leak in ssl module.
  ........
................
  r83685 | mark.dickinson | 2010-08-03 19:46:28 +0100 (Tue, 03 Aug 2010) | 9 lines

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

  ........
    r83683 | mark.dickinson | 2010-08-03 19:44:16 +0100 (Tue, 03 Aug 2010) | 1 line

    Misc/NEWS entry for r83677.
  ........
................
2010-08-03 18:50:32 +00:00
Ezio Melotti 213bcb8de1 Fix buildbot failure in test_os.py 2010-08-03 10:44:09 +00:00
Georg Brandl 1ce3a6864c Fix 2.7ism. 2010-08-03 10:16:19 +00:00
Ezio Melotti c438d1d021 Fix deprecation warnings in test_sets.py 2010-08-03 08:54:36 +00:00