Blocked revisions 74461,74528,74577,74580,74703,74743,74826,74939,75086,75093,75118,75173,75198,75242,75244-75245,75306,75311,75369,75435,75439,75448,75508,75512,75622,75652,75656,75661,75665,75668,75673,75676,75719,75721,75723,75733,75740,75744,75746,75834,75845,75847 via svnmerge

................
  r74461 | benjamin.peterson | 2009-08-15 16:08:53 +0200 (Sa, 15 Aug 2009) | 8 lines

  Blocked revisions 74445 via svnmerge

  ........
    r74445 | vinay.sajip | 2009-08-14 06:33:54 -0500 (Fri, 14 Aug 2009) | 1 line

    Added versionchanged notices for optional 'delay' parameter to file handler classes.
  ........
................
  r74528 | tarek.ziade | 2009-08-20 23:25:41 +0200 (Do, 20 Aug 2009) | 8 lines

  Blocked revisions 74503 via svnmerge

  ........
    r74503 | tarek.ziade | 2009-08-18 10:21:49 +0200 (Tue, 18 Aug 2009) | 1 line

    fixed typo
  ........
................
  r74577 | mark.dickinson | 2009-08-28 23:04:57 +0200 (Fr, 28 Aug 2009) | 8 lines

  Blocked revisions 74575 via svnmerge

  ........
    r74575 | mark.dickinson | 2009-08-28 21:46:24 +0100 (Fri, 28 Aug 2009) | 1 line

    Silence gcc 'comparison always false' warning
  ........
................
  r74580 | benjamin.peterson | 2009-08-29 15:44:43 +0200 (Sa, 29 Aug 2009) | 53 lines

  Blocked revisions 72880,74098,74100,74463,74522,74537,74543,74569-74570 via svnmerge

  ........
    r72880 | senthil.kumaran | 2009-05-24 04:14:50 -0500 (Sun, 24 May 2009) | 3 lines

    Fixed Issue1424152, urllib2 fails with HTTPS over Proxy.
  ........
    r74098 | kristjan.jonsson | 2009-07-19 17:14:00 -0500 (Sun, 19 Jul 2009) | 2 lines

    http://bugs.python.org/issue6499
    zlib/gzip may not be present for all builds.  Make xmlrpclib gracefully not supporg gzip encoding in this case
  ........
    r74100 | kristjan.jonsson | 2009-07-19 17:35:44 -0500 (Sun, 19 Jul 2009) | 2 lines

    http://bugs.python.org/issue6499
    gzip.GzipFile may not exist as a parent class
  ........
    r74463 | gregory.p.smith | 2009-08-15 17:39:03 -0500 (Sat, 15 Aug 2009) | 6 lines

    Force the http connection to close after any request returned when
    buffering=True as our buffered data is not known to the HTTPConnection and may
    contain data needed by a future request if the connection were left open.

    See http://bugs.python.org/issue2576 and http://bugs.python.org/issue4879.
  ........
    r74522 | gregory.p.smith | 2009-08-19 00:33:48 -0500 (Wed, 19 Aug 2009) | 8 lines

    Revert the changes from r74463, they were causing test_xmlrpc to fail.
    We do not need to force a close when using socket buffering on a
    httplib.HTTPRequest as the library does not support streaming requests
    so there should never been extra data beyond the end of the current
    request to have left over in the requests socket buffer.

    see http://bugs.python.org/issue6724
  ........
    r74537 | tarek.ziade | 2009-08-21 09:28:38 -0500 (Fri, 21 Aug 2009) | 1 line

    fixed misplaced Issue line
  ........
    r74543 | kristjan.jonsson | 2009-08-24 06:39:31 -0500 (Mon, 24 Aug 2009) | 2 lines

    issue 6769
    fix a mistake in instantiatiating the HTTPSConnection class.
  ........
    r74569 | benjamin.peterson | 2009-08-28 11:48:03 -0500 (Fri, 28 Aug 2009) | 1 line

    restricted environments are no more
  ........
    r74570 | benjamin.peterson | 2009-08-28 11:49:56 -0500 (Fri, 28 Aug 2009) | 1 line

    remove more code for restricted execution
  ........
................
  r74703 | benjamin.peterson | 2009-09-07 15:03:49 +0200 (Mo, 07 Sep 2009) | 12 lines

  Blocked revisions 74699,74702 via svnmerge

  ........
    r74699 | benjamin.peterson | 2009-09-06 17:43:39 -0500 (Sun, 06 Sep 2009) | 1 line

    PyObject_GetIter can set an error for its self just fine
  ........
    r74702 | benjamin.peterson | 2009-09-07 08:02:15 -0500 (Mon, 07 Sep 2009) | 1 line

    revert r74699 since it loses useful error information
  ........
................
  r74743 | benjamin.peterson | 2009-09-11 23:24:36 +0200 (Fr, 11 Sep 2009) | 12 lines

  Blocked revisions 74733-74734 via svnmerge

  ........
    r74733 | benjamin.peterson | 2009-09-09 06:40:54 -0500 (Wed, 09 Sep 2009) | 1 line

    tabbify
  ........
    r74734 | benjamin.peterson | 2009-09-09 06:42:57 -0500 (Wed, 09 Sep 2009) | 1 line

    revert unintended changes
  ........
................
  r74826 | ezio.melotti | 2009-09-16 15:22:57 +0200 (Mi, 16 Sep 2009) | 8 lines

  Blocked revisions 74825 via svnmerge

  ........
    r74825 | ezio.melotti | 2009-09-16 16:14:05 +0300 (Wed, 16 Sep 2009) | 1 line

    #6879 - fix misstatement about exceptions
  ........
................
  r74939 | benjamin.peterson | 2009-09-18 23:51:43 +0200 (Fr, 18 Sep 2009) | 12 lines

  Blocked revisions 74936-74937 via svnmerge

  ........
    r74936 | benjamin.peterson | 2009-09-18 16:46:21 -0500 (Fri, 18 Sep 2009) | 1 line

    backport keyword argument support for bytearray.decode
  ........
    r74937 | benjamin.peterson | 2009-09-18 16:47:27 -0500 (Fri, 18 Sep 2009) | 1 line

    typo
  ........
................
  r75086 | mark.dickinson | 2009-09-27 18:08:13 +0200 (So, 27 Sep 2009) | 9 lines

  Blocked revisions 75084 via svnmerge

  ........
    r75084 | mark.dickinson | 2009-09-27 17:05:21 +0100 (Sun, 27 Sep 2009) | 3 lines

    Issue #6713:  Improve decimal int -> string conversions.  Thanks Gawain
    Bolton for the suggestion and original patches.
  ........
................
  r75093 | mark.dickinson | 2009-09-27 18:41:06 +0200 (So, 27 Sep 2009) | 8 lines

  Blocked revisions 75091 via svnmerge

  ........
    r75091 | mark.dickinson | 2009-09-27 17:39:28 +0100 (Sun, 27 Sep 2009) | 1 line

    Eliminate unnecessary get_wrapped_(u)long defines in struct module.
  ........
................
  r75118 | r.david.murray | 2009-09-28 20:55:36 +0200 (Mo, 28 Sep 2009) | 8 lines

  Blocked revisions 75115 via svnmerge

  ........
    r75115 | r.david.murray | 2009-09-28 14:29:28 -0400 (Mon, 28 Sep 2009) | 2 lines

    Applying patches backported from 3.1, by Gregor Lingl.
  ........
................
  r75173 | antoine.pitrou | 2009-10-01 19:09:15 +0200 (Do, 01 Okt 2009) | 9 lines

  Blocked revisions 75171 via svnmerge

  ........
    r75171 | antoine.pitrou | 2009-10-01 19:08:03 +0200 (jeu., 01 oct. 2009) | 4 lines

    Sync the 2.x `io` docs with py3k, with a small note as to the distinction
    between bytes streams and text streams.
  ........
................
  r75198 | tarek.ziade | 2009-10-03 02:10:24 +0200 (Sa, 03 Okt 2009) | 8 lines

  Blocked revisions 75196 via svnmerge

  ........
    r75196 | tarek.ziade | 2009-10-03 02:07:35 +0200 (Sat, 03 Oct 2009) | 1 line

    removing the last remaning apply() calls
  ........
................
  r75242 | benjamin.peterson | 2009-10-04 22:13:06 +0200 (So, 04 Okt 2009) | 10 lines

  Blocked revisions 74845 via svnmerge

  ........
    r74845 | georg.brandl | 2009-09-16 15:30:09 -0500 (Wed, 16 Sep 2009) | 5 lines

    #6844: do not emit DeprecationWarnings on access if Exception.message has been set by the user.

    This works by always setting it in __dict__, except when it's implicitly set in __init__.
  ........
................
  r75244 | benjamin.peterson | 2009-10-04 22:23:37 +0200 (So, 04 Okt 2009) | 20 lines

  Blocked revisions 74849,75143,75181 via svnmerge

  ........
    r74849 | thomas.wouters | 2009-09-16 15:36:34 -0500 (Wed, 16 Sep 2009) | 4 lines


    Add news entry for r74841.
  ........
    r75143 | philip.jenvey | 2009-09-29 14:10:15 -0500 (Tue, 29 Sep 2009) | 5 lines

    #5329: fix os.popen* regression from 2.5: don't execute commands as a sequence
    through the shell. also document the correct subprocess replacement for this
    case
    patch from Jean-Paul Calderone and Jani Hakala
  ........
    r75181 | georg.brandl | 2009-10-01 16:02:39 -0500 (Thu, 01 Oct 2009) | 1 line

    Add NEWS entry for r75180.
  ........
................
  r75245 | benjamin.peterson | 2009-10-04 22:28:48 +0200 (So, 04 Okt 2009) | 16 lines

  Blocked revisions 75164-75166 via svnmerge

  ........
    r75164 | senthil.kumaran | 2009-09-30 20:07:03 -0500 (Wed, 30 Sep 2009) | 3 lines

    Fix for issue7026 test_urllib: unsetting missing 'env' variable.
  ........
    r75165 | senthil.kumaran | 2009-09-30 20:19:18 -0500 (Wed, 30 Sep 2009) | 3 lines

    using dict.unset(k) instead of del dict[k]. consistent with release26-maint
  ........
    r75166 | senthil.kumaran | 2009-09-30 20:50:13 -0500 (Wed, 30 Sep 2009) | 3 lines

    That's self.env.unset(k) and not env.unset(k) I was heading back to the problem.
  ........
................
  r75306 | benjamin.peterson | 2009-10-10 00:34:44 +0200 (Sa, 10 Okt 2009) | 12 lines

  Blocked revisions 75304-75305 via svnmerge

  ........
    r75304 | benjamin.peterson | 2009-10-09 17:05:45 -0500 (Fri, 09 Oct 2009) | 1 line

    replace callable()
  ........
    r75305 | benjamin.peterson | 2009-10-09 17:15:50 -0500 (Fri, 09 Oct 2009) | 1 line

    replace has_key with 'in' operator
  ........
................
  r75311 | benjamin.peterson | 2009-10-10 22:39:25 +0200 (Sa, 10 Okt 2009) | 8 lines

  Blocked revisions 75310 via svnmerge

  ........
    r75310 | vinay.sajip | 2009-10-10 15:32:36 -0500 (Sat, 10 Oct 2009) | 1 line

    Issue #7086: Added TCP support to SysLogHandler and tidied up some anachronisms in the code.
  ........
................
  r75369 | antoine.pitrou | 2009-10-11 23:07:02 +0200 (So, 11 Okt 2009) | 9 lines

  Blocked revisions 75367 via svnmerge

  ........
    r75367 | antoine.pitrou | 2009-10-11 23:03:26 +0200 (dim., 11 oct. 2009) | 4 lines

    Issue #7084: Fix a (very unlikely) crash when printing a list from one
    thread, and mutating it from another one.  Patch by Scott Dial.
  ........
................
  r75435 | mark.dickinson | 2009-10-15 17:22:09 +0200 (Do, 15 Okt 2009) | 8 lines

  Blocked revisions 75434 via svnmerge

  ........
    r75434 | mark.dickinson | 2009-10-15 16:18:55 +0100 (Thu, 15 Oct 2009) | 1 line

    Fix missing semicolon
  ........
................
  r75439 | mark.dickinson | 2009-10-15 17:54:39 +0200 (Do, 15 Okt 2009) | 8 lines

  Blocked revisions 75438 via svnmerge

  ........
    r75438 | mark.dickinson | 2009-10-15 16:53:58 +0100 (Thu, 15 Oct 2009) | 1 line

    Issue #7142:  Fix uses of unicode in memoryview objects
  ........
................
  r75448 | eric.smith | 2009-10-16 16:33:35 +0200 (Fr, 16 Okt 2009) | 8 lines

  Blocked revisions 75446 via svnmerge

  ........
    r75446 | eric.smith | 2009-10-16 10:26:36 -0400 (Fri, 16 Oct 2009) | 1 line

    Removed usage of unsafe PyFloat_AsString.
  ........
................
  r75508 | eric.smith | 2009-10-19 02:35:35 +0200 (Mo, 19 Okt 2009) | 14 lines

  Blocked revisions 75506 via svnmerge

  ........
    r75506 | eric.smith | 2009-10-18 20:34:12 -0400 (Sun, 18 Oct 2009) | 7 lines

    Removed calls to PyFloat_AsReprString.
    This is in anticipation of possibly implementing issue 7117 (short float repr).
    This removes the last calls to PyFloat_AsString, PyFloat_AsReprString, and
    PyFloat_AsStringEx, which are unsafe.

    Also, switch to defines for error values to bring this code more in line
    with the py3k branch.
  ........
................
  r75512 | eric.smith | 2009-10-19 16:42:58 +0200 (Mo, 19 Okt 2009) | 8 lines

  Blocked revisions 75510 via svnmerge

  ........
    r75510 | eric.smith | 2009-10-19 10:38:14 -0400 (Mon, 19 Oct 2009) | 1 line

    Issue #7169: Document PyFloat_AsString and PyFloat_AsReprString, and note that they are unsafe and deprecated.
  ........
................
  r75622 | eric.smith | 2009-10-22 22:48:54 +0200 (Do, 22 Okt 2009) | 8 lines

  Blocked revisions 75620 via svnmerge

  ........
    r75620 | eric.smith | 2009-10-22 16:13:14 -0400 (Thu, 22 Oct 2009) | 1 line

    Per the discussion in issue6882, backport the try/finally work that was done to the py3k version (mostly in r59477, I think).
  ........
................
  r75652 | mark.dickinson | 2009-10-24 14:15:17 +0200 (Sa, 24 Okt 2009) | 12 lines

  Blocked revisions 75651 via svnmerge

  ........
    r75651 | mark.dickinson | 2009-10-24 13:13:30 +0100 (Sat, 24 Oct 2009) | 7 lines

    Issue #7117: Prepare for backport of py3k float repr.
    Add the Python/dtoa.c file containing the main algorithms;
    add corresponding include file and include in Python.h;
    include license information for Python/dtoa.c;
    add dtoa.c and dtoa.h to Makefile.
  ........
................
  r75656 | antoine.pitrou | 2009-10-24 14:31:03 +0200 (Sa, 24 Okt 2009) | 16 lines

  Blocked revisions 75650,75654-75655 via svnmerge

  ........
    r75650 | antoine.pitrou | 2009-10-24 13:59:41 +0200 (sam., 24 oct. 2009) | 3 lines

    Manual py3k backport: [svn r74155] Issue #6242: Fix deallocator of io.StringIO and io.BytesIO
  ........
    r75654 | antoine.pitrou | 2009-10-24 14:23:18 +0200 (sam., 24 oct. 2009) | 3 lines

    Manual py3k backport: [svn r74158] Issue #6218: Make io.BytesIO and io.StringIO picklable.
  ........
    r75655 | antoine.pitrou | 2009-10-24 14:28:22 +0200 (sam., 24 oct. 2009) | 3 lines

    Manual py3k backport: [svn r74316] Issue #5449: Fix io.BytesIO to not accept arbitrary keywords
  ........
................
  r75661 | mark.dickinson | 2009-10-24 15:32:56 +0200 (Sa, 24 Okt 2009) | 22 lines

  Blocked revisions 75653,75658,75660 via svnmerge

  ........
    r75653 | mark.dickinson | 2009-10-24 13:17:24 +0100 (Sat, 24 Oct 2009) | 1 line

    Temporary define to avoid build failure
  ........
    r75658 | mark.dickinson | 2009-10-24 14:28:38 +0100 (Sat, 24 Oct 2009) | 8 lines

    Issue #7117 (backport py3k float repr) continued:
     - add double endianness detection to configure script
     - add configure-time check to see whether we can use inline
       assembly to get and set x87 control word in configure script
     - add functions to get and set x87 control word in Python/pymath.c
     - add pyport.h logic to determine whether it's safe to use the
       short float repr or not
  ........
    r75660 | mark.dickinson | 2009-10-24 14:31:41 +0100 (Sat, 24 Oct 2009) | 1 line

    Remove temporary define from r75653
  ........
................
  r75665 | mark.dickinson | 2009-10-24 15:46:38 +0200 (Sa, 24 Okt 2009) | 8 lines

  Blocked revisions 75664 via svnmerge

  ........
    r75664 | mark.dickinson | 2009-10-24 14:44:16 +0100 (Sat, 24 Oct 2009) | 1 line

    Configure check for double rounding should take BASECFLAGS into account
  ........
................
  r75668 | mark.dickinson | 2009-10-24 16:05:34 +0200 (Sa, 24 Okt 2009) | 10 lines

  Blocked revisions 75666 via svnmerge

  ........
    r75666 | mark.dickinson | 2009-10-24 15:01:08 +0100 (Sat, 24 Oct 2009) | 4 lines

    Issue #7117 (backport py3k float repr) continued:
    Add sys.float_repr_style attribute ('short' if short float
    repr is in used;  'legacy' otherwise).
  ........
................
  r75673 | mark.dickinson | 2009-10-24 17:56:07 +0200 (Sa, 24 Okt 2009) | 10 lines

  Blocked revisions 75672 via svnmerge

  ........
    r75672 | mark.dickinson | 2009-10-24 16:54:35 +0100 (Sat, 24 Oct 2009) | 4 lines

    Issue #7117:  temporarily disable the short float repr while the
    pieces are being assembled.  To re-enable, define the preprocessor
    symbol PY_SHORT_FLOAT_REPR
  ........
................
  r75676 | eric.smith | 2009-10-24 21:52:23 +0200 (Sa, 24 Okt 2009) | 8 lines

  Blocked revisions 75675 via svnmerge

  ........
    r75675 | eric.smith | 2009-10-24 15:50:44 -0400 (Sat, 24 Oct 2009) | 1 line

    Removed unused function PyFloat_AsStringEx. It is unused in floatobject.c, and it's not declared in any .h file.
  ........
................
  r75719 | eric.smith | 2009-10-26 16:10:57 +0100 (Mo, 26 Okt 2009) | 12 lines

  Blocked revisions 75717-75718 via svnmerge

  ........
    r75717 | eric.smith | 2009-10-26 10:48:55 -0400 (Mon, 26 Oct 2009) | 1 line

    Start to remove _PyOS_double_to_string, as mentioned in issue 7117.
  ........
    r75718 | eric.smith | 2009-10-26 11:06:39 -0400 (Mon, 26 Oct 2009) | 1 line

    Continue removing _PyOS_double_to_string, as mentioned in issue 7117.
  ........
................
  r75721 | mark.dickinson | 2009-10-26 16:40:42 +0100 (Mo, 26 Okt 2009) | 9 lines

  Blocked revisions 75720 via svnmerge

  ........
    r75720 | mark.dickinson | 2009-10-26 15:39:50 +0000 (Mon, 26 Oct 2009) | 3 lines

    Issue #7117 (backport py3k float repr) continued:
    Backport pystrtod.c from py3k.
  ........
................
  r75723 | eric.smith | 2009-10-26 18:48:13 +0100 (Mo, 26 Okt 2009) | 8 lines

  Blocked revisions 75722 via svnmerge

  ........
    r75722 | eric.smith | 2009-10-26 13:46:17 -0400 (Mon, 26 Oct 2009) | 1 line

    Finished removing _PyOS_double_to_string, as mentioned in issue 7117.
  ........
................
  r75733 | mark.dickinson | 2009-10-26 22:13:15 +0100 (Mo, 26 Okt 2009) | 14 lines

  Blocked revisions 75730-75731 via svnmerge

  ........
    r75730 | mark.dickinson | 2009-10-26 21:09:09 +0000 (Mon, 26 Oct 2009) | 2 lines

    Issue #7117:  Backport missing pystrtod.h declarations from py3k.
  ........
    r75731 | mark.dickinson | 2009-10-26 21:11:20 +0000 (Mon, 26 Oct 2009) | 4 lines

    Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in
    floatobject.c.  Also, remove limitation on length of unicode inputs to
    float().
  ........
................
  r75740 | mark.dickinson | 2009-10-26 23:29:02 +0100 (Mo, 26 Okt 2009) | 10 lines

  Blocked revisions 75739 via svnmerge

  ........
    r75739 | mark.dickinson | 2009-10-26 22:28:14 +0000 (Mon, 26 Oct 2009) | 5 lines

    Issue #7117: Use PyOS_string_to_double instead of PyOS_ascii_strtod in
    complexobject.c.  Also remove length restriction on unicode inputs to
    the complex constructor.
  ........
................
  r75744 | eric.smith | 2009-10-27 12:36:44 +0100 (Di, 27 Okt 2009) | 8 lines

  Blocked revisions 75743 via svnmerge

  ........
    r75743 | eric.smith | 2009-10-27 07:32:11 -0400 (Tue, 27 Oct 2009) | 1 line

    Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in cPickle as part of short float repr.
  ........
................
  r75746 | eric.smith | 2009-10-27 13:13:06 +0100 (Di, 27 Okt 2009) | 8 lines

  Blocked revisions 75745 via svnmerge

  ........
    r75745 | eric.smith | 2009-10-27 08:12:44 -0400 (Tue, 27 Oct 2009) | 1 line

    Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in stropmodule as part of short float repr.
  ........
................
  r75834 | eric.smith | 2009-10-27 19:47:34 +0100 (Di, 27 Okt 2009) | 8 lines

  Blocked revisions 75824 via svnmerge

  ........
    r75824 | eric.smith | 2009-10-27 14:33:14 -0400 (Tue, 27 Oct 2009) | 1 line

    Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117.
  ........
................
  r75845 | antoine.pitrou | 2009-10-27 20:39:10 +0100 (Di, 27 Okt 2009) | 8 lines

  Blocked revisions 75844 via svnmerge

  ........
    r75844 | antoine.pitrou | 2009-10-27 20:36:44 +0100 (mar., 27 oct. 2009) | 3 lines

    Suppress transient refleaks in test_file2k.
  ........
................
  r75847 | eric.smith | 2009-10-27 20:44:06 +0100 (Di, 27 Okt 2009) | 8 lines

  Blocked revisions 75846 via svnmerge

  ........
    r75846 | eric.smith | 2009-10-27 15:42:57 -0400 (Tue, 27 Oct 2009) | 1 line

    Removed PyOS_ascii_atof from marshal.c, as mentioned in issue 7117. Also brings it more in line with py3k.
  ........
................