From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 27 Oct 2009 18:47:55 +0000 (+0000)
Subject: Blocked revisions 75732,75737-75738,75741 via svnmerge
X-Git-Tag: v3.1.2rc1~407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=722014a0df22ceb1d2df797a6548eec7347c7ec2;p=python

Blocked revisions 75732,75737-75738,75741 via svnmerge

........
  r75732 | mark.dickinson | 2009-10-26 21:12:50 +0000 (Mon, 26 Oct 2009) | 1 line

  Fix extra-long line;  also makes py3k match trunk here.
........
  r75737 | mark.dickinson | 2009-10-26 21:51:18 +0000 (Mon, 26 Oct 2009) | 1 line

  Remove length limitation on string arguments to complex()
........
  r75738 | mark.dickinson | 2009-10-26 22:05:06 +0000 (Mon, 26 Oct 2009) | 1 line

  Make sure memory is freed on error in complex_subtype_from_string.
........
  r75741 | mark.dickinson | 2009-10-26 22:48:32 +0000 (Mon, 26 Oct 2009) | 2 lines

  Issue #7207:  Fix race condition in telnetlib test;  should stop test failures on OS X 10.6.
........
---