]> granicus.if.org Git - python/commitdiff
merge from 3.3
authorSenthil Kumaran <senthil@uthcode.com>
Sat, 1 Jun 2013 18:12:52 +0000 (11:12 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Sat, 1 Jun 2013 18:12:52 +0000 (11:12 -0700)
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.

1  2 
Lib/urllib/request.py

Simple merge