From: Senthil Kumaran <senthil@uthcode.com>
Date: Sat, 1 Jun 2013 18:12:52 +0000 (-0700)
Subject: merge from 3.3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88249b80d7f374401e61fee4e08e446b03bb613d;p=python

merge from 3.3

Fix thishost helper funtion in urllib. Returns the ipaddress of localhost when
hostname is resolvable by socket.gethostname for local machine. This all fixes
certain freebsd builtbot failures.
---

88249b80d7f374401e61fee4e08e446b03bb613d