[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/bd3e9dcbd9ab
changeset:   93374:bd3e9dcbd9ab
parent:      93370:731375f83406
parent:      93373:a716afa8e23f
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 03 15:12:52 2014 -0500
summary:
  merge 3.4

files:
  Lib/test/test_socket.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1293,9 +1293,10 @@
             if e.errno == socket.EAI_NODATA:
                 self.skipTest('internet access required for this test')
         # these should all be successful
-        socket.gethostbyname('испытание.python.org')
-        socket.gethostbyname_ex('испытание.python.org')
-        socket.getaddrinfo('испытание.python.org',0,socket.AF_UNSPEC,socket.SOCK_STREAM)
+        domain = 'испытание.pythontest.net'
+        socket.gethostbyname(domain)
+        socket.gethostbyname_ex(domain)
+        socket.getaddrinfo(domain,0,socket.AF_UNSPEC,socket.SOCK_STREAM)
         # this may not work if the forward lookup choses the IPv6 address, as that doesn't
         # have a reverse entry yet
         # socket.gethostbyaddr('испытание.python.org')

-- 
Repository URL: https://hg.python.org/cpython