Commit Graph

15034 Commits

Author SHA1 Message Date
Barry Warsaw 34289260da Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit
message:

Cross-port changes for 2.6.7rc2 from the Subversion branch.
2011-05-23 15:26:11 -04:00
Barry Warsaw cf0d8ab818 Replay changeset 70238:03e488b5c009 from fubar branch. Original commit
message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.
2011-05-23 15:22:56 -04:00
Guido van Rossum 079381d236 Merge issue 11662 from 2.5. 2011-03-29 12:51:16 -07:00
guido@google.com f1509306d2 Add tests for the urllib[2] vulnerability. Change to raise exceptions. 2011-03-28 13:47:01 -07:00
guido@google.com 2bc23b8448 Add FTP to the allowed url schemes. Add Misc/NEWS. 2011-03-24 10:44:17 -07:00
guido@google.com 60a4a90c8d Issue 22663: fix redirect vulnerability in urllib/urllib2. 2011-03-24 08:07:45 -07:00
Senthil Kumaran dfd1579e54 merge from 2.5 branch. 2011-03-17 14:23:24 +08:00
Senthil Kumaran 3853586e0c Fix issue11442 - Add a charset parameter to the Content-type to avoid XSS attacks.
Patch by Tom N. (Backported from py3k codeline).
2011-03-17 12:34:18 +08:00
Vinay Sajip 3ae81137c8 Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch. 2011-03-11 18:44:10 +00:00
Vinay Sajip f4d0af460a Issue #11444: Lock handlers while flushing/closing during shutdown. 2011-03-08 22:39:55 +00:00
Vinay Sajip 8dd2a40bc7 Issue #11424: Fix bug in determining child loggers. 2011-03-07 15:02:11 +00:00
Georg Brandl 4db2c257d6 Add .hgeol file and fix newlines in the 2.5 branch. 2011-03-05 15:02:28 +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
Barry Warsaw d724296fc3 2.6.6 final. \o/ 2010-08-23 23:37:56 +00:00
Barry Warsaw 607a2e3f6d Bumping to 2.6.6rc2. 2010-08-16 22:19:57 +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 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 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
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 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
Ezio Melotti 213bcb8de1 Fix buildbot failure in test_os.py 2010-08-03 10:44:09 +00:00
Ezio Melotti c438d1d021 Fix deprecation warnings in test_sets.py 2010-08-03 08:54:36 +00:00
Ezio Melotti 5c75235d32 Fix deprecation warnings in test_set.py 2010-08-03 08:41:02 +00:00
Ezio Melotti ffd0b8892e Try again to fix the buildbots. 2010-08-03 08:33:58 +00:00
Ezio Melotti 9bab5249aa Fix deprecation warnings in test_commands.py 2010-08-03 08:32:53 +00:00
Ezio Melotti 8a078d5b4c Fix deprecation warnings in test_cgi.py 2010-08-03 08:28:31 +00:00
Ronald Oussoren f7a13b3210 Merged revisions 83646 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83646 | ronald.oussoren | 2010-08-03 09:44:35 +0200 (Tue, 03 Aug 2010) | 9 lines

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

  ........
    r83644 | ronald.oussoren | 2010-08-03 09:42:42 +0200 (Tue, 03 Aug 2010) | 2 lines

    Fix for issue 9455: platform.mac_ver() broken on OSX/ppc
  ........
................
2010-08-03 08:09:15 +00:00
Ronald Oussoren bb4d9f6c3d Merged revisions 83643 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83643 | ronald.oussoren | 2010-08-03 09:31:12 +0200 (Tue, 03 Aug 2010) | 13 lines

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

  ........
    r83431 | ronald.oussoren | 2010-08-01 21:18:13 +0200 (Sun, 01 Aug 2010) | 6 lines


    test_getgroups as introduced with issue7900 failed on systems
    where 'id -G' and posix.getgroups() returned the same information,
    but one of the sources contains duplicate information. Rewrite the
    check using sets instead of lists.
  ........
................
2010-08-03 08:07:18 +00:00
Ezio Melotti e511c6ce8d Merged revisions 79191 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79191 | florent.xicluna | 2010-03-21 13:50:17 +0200 (Sun, 21 Mar 2010) | 3 lines

  No more deprecation warnings for distutils.sysconfig, following r78666.
  But when the "dl" module is available, it gives a py3k deprecation warning.
........
2010-08-03 07:51:50 +00:00
Ezio Melotti dba728b87c quiet, not quite. 2010-08-03 07:18:07 +00:00
Ezio Melotti dfe2107481 Fix deprecation warnings in test_file.py 2010-08-03 07:17:20 +00:00
Ezio Melotti cd37dd8e05 Fix deprecation warnings in test_hotshot.py 2010-08-03 07:03:40 +00:00
Ezio Melotti 670048de80 Fix deprecation warnings in test_long_future.py 2010-08-03 07:01:05 +00:00
Ezio Melotti aad1541484 Fix deprecation warnings in test_os.py 2010-08-03 06:49:14 +00:00
Ezio Melotti 192f6782c6 Try to fix test_struct.py on some buildbots. 2010-08-03 06:39:49 +00:00
Ezio Melotti ee1e2c90dd Fix deprecation warnings in test_scope.py 2010-08-03 06:37:50 +00:00
Ezio Melotti 90a732c23c Merged revisions 79156 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79156 | florent.xicluna | 2010-03-21 00:21:02 +0200 (Sun, 21 Mar 2010) | 2 lines

  Cleanup test_struct using check_warnings.
........
2010-08-03 06:13:35 +00:00
Ezio Melotti 6db340cc12 Fix deprecation warning in test_univnewlines.py 2010-08-03 05:57:13 +00:00