From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 16 Jun 2010 12:53:07 +0000 (+0000)
Subject: Blocked revisions 81571,81678 via svnmerge
X-Git-Tag: v3.2a1~519
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7a15720973076a90dcdbeb041a7f82a8845241d;p=thirdparty%2FPython%2Fcpython.git

Blocked revisions 81571,81678 via svnmerge

I'm going to merge 81678 by hand.

........
  r81571 | victor.stinner | 2010-05-27 18:29:48 -0400 (Thu, 27 May 2010) | 3 lines

  Issue #8835: test_support.transient_internet() catchs gaierror(EAI_NONAME) and
  gaierror(EAI_NODATA)
........
  r81678 | r.david.murray | 2010-06-03 16:19:25 -0400 (Thu, 03 Jun 2010) | 7 lines

  #8889: rewrite transient_internet so we don't use EAI_NODATA on FreeBSD.

  FreeBSD doesn't have socket.EAI_NODATA.  I rewrote the routine because
  there's no easy way to conditionally include a context manager in a
  with statement.  As a side benefit, instead of a stack of context
  managers there's now only one.
........
---