Commit Graph

40438 Commits

Author SHA1 Message Date
Tarek Ziadé 0c21bdf3c3 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
  ........
................
2010-04-21 13:37:17 +00:00
R. David Murray 44546f89a8 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.
  ........
................
2010-04-21 01:59:28 +00:00
Mark Dickinson e8ab2220c0 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.
........
2010-04-20 23:24:53 +00:00
Mark Dickinson 20d00fce76 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.
........
2010-04-20 23:01:53 +00:00
Tarek Ziadé 8cf6d42fe9 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
  ........
................
2010-04-20 21:43:35 +00:00
Ronald Oussoren 8c882bc5fb Ensure the framework installs cleanly after
the recent changes to CFLAGS and BASECFLAGS.
2010-04-20 16:38:53 +00:00
Tarek Ziadé c5c9ee4093 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
........
2010-04-20 14:32:32 +00:00
Ezio Melotti 71db25dd03 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.
........
2010-04-20 11:28:02 +00:00
Ezio Melotti 329daf86ab Blocked revisions 80259 via svnmerge
........
  r80259 | ezio.melotti | 2010-04-20 13:57:44 +0300 (Tue, 20 Apr 2010) | 1 line

  Fix two versionchanged.
........
2010-04-20 10:58:36 +00:00
Senthil Kumaran dcedfb11b9 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.
  ........
................
2010-04-20 10:40:21 +00:00
Ezio Melotti f2e330a9c5 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.
........
2010-04-20 10:31:04 +00:00
Ezio Melotti 0ef25edef4 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.
........
2010-04-20 09:43:38 +00:00
Ezio Melotti 8d5c16a4e7 Add a missing versionadded in unittest.rst. 2010-04-20 09:36:13 +00:00
Ezio Melotti f342235170 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.
........
2010-04-20 09:34:36 +00:00
Tarek Ziadé 0bc9ef1efd 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
........
2010-04-20 09:13:54 +00:00
Tarek Ziadé b67eea239b 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
........
2010-04-20 08:58:12 +00:00
Stefan Krah f1da97304d 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.
  ........
................
2010-04-20 08:15:14 +00:00
Ronald Oussoren 8e96394f24 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)
  ........
................
2010-04-20 06:37:54 +00:00
Tarek Ziadé ac0ce54e8b 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
........
2010-04-19 22:32:10 +00:00
Giampaolo Rodolà f527940dbd 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
  ........
................
2010-04-19 22:10:56 +00:00
Tarek Ziadé ccee356829 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.
  ........
................
2010-04-19 21:33:22 +00:00
Tarek Ziadé 40400dedf5 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
  ........
................
2010-04-19 21:25:19 +00:00
Raymond Hettinger dbe961215a Issue 8436: set.__init__ accepts keyword args 2010-04-18 23:03:16 +00:00
Ronald Oussoren 4ec45df9a7 Fix for issue #5652 2010-04-18 20:54:33 +00:00
Ronald Oussoren 218cc58d08 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
........
2010-04-18 20:49:34 +00:00
Raymond Hettinger b136a9c9d7 Issue 8420: Fix ref counting problem in set_repr(). 2010-04-18 20:28:33 +00:00
Ronald Oussoren 79a9351b52 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.
  ........
................
2010-04-18 19:08:47 +00:00
Ronald Oussoren a107819d0c 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
  ........
................
2010-04-18 15:25:17 +00:00
Ronald Oussoren 3a20d05dcc 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
  ........
................
2010-04-18 15:08:43 +00:00
Giampaolo Rodolà 5ec05cdc69 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
  ........
................
2010-04-18 13:42:40 +00:00
Giampaolo Rodolà 22357e1e01 Fix Issue #3817: 225 is now considered a valid response code for ABOR 2010-04-18 13:23:21 +00:00
Victor Stinner a88d7dfda8 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).
........
2010-04-18 08:25:10 +00:00
Victor Stinner 387a785456 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.
........
2010-04-18 08:03:53 +00:00
Victor Stinner ba1f449ca2 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.
........
2010-04-18 00:03:40 +00:00
Senthil Kumaran 6ffdb6f921 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.
  ........
................
2010-04-17 14:47:13 +00:00
Victor Stinner c4836e7e88 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.
........
2010-04-16 23:56:48 +00:00
Benjamin Peterson 9eb6b00cb0 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
........
2010-04-16 23:26:56 +00:00
Benjamin Peterson 0ff8a505c6 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
  ........
................
2010-04-16 23:19:11 +00:00
Mark Dickinson 466e9266d1 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.
........
2010-04-16 16:32:49 +00:00
Victor Stinner f45c368f4d 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.
........
2010-04-16 15:48:19 +00:00
Victor Stinner 30ba25b865 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
........
2010-04-16 15:44:04 +00:00
R. David Murray ec51d03e61 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.
........
2010-04-16 13:37:56 +00:00
Victor Stinner a5ab4fcf68 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.
........
2010-04-16 12:47:52 +00:00
Victor Stinner 81eb8d4610 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).
2010-04-16 12:11:27 +00:00
Senthil Kumaran a6023ca337 Reverting the previous checkin (80103). The feature should not have been merged to 3.1 maint. 2010-04-16 11:28:05 +00:00
Senthil Kumaran 2176ad5f30 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)
  ........
................
2010-04-16 03:06:19 +00:00
Senthil Kumaran 0e3e485452 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.
........
2010-04-15 17:21:29 +00:00
R. David Murray 84ee3103a3 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.
  ........
................
2010-04-14 19:05:38 +00:00
Brian Curtin 6f353a04a3 Fixed extraneous _winreg (changed to winreg in py3k). Thanks, Tim Golden. 2010-04-13 12:44:24 +00:00
Mark Dickinson ea9dbb8e51 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.
........
2010-04-13 11:55:57 +00:00