summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-11-03 20:12:52 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-11-03 20:12:52 (GMT)
commit678e11aa22a401058f7f5ebb1fbd6fd6c9ec3b93 (patch)
tree5843080a2166476796ed3cacf69c0bf5f6cf4f0f /Lib
parent1cca273669598978f6dfc1d1aad92e02a84bbe04 (diff)
parent8d2d5b9c598d319bc209667f3ae8d2d5186ac82e (diff)
downloadcpython-678e11aa22a401058f7f5ebb1fbd6fd6c9ec3b93.zip
cpython-678e11aa22a401058f7f5ebb1fbd6fd6c9ec3b93.tar.gz
cpython-678e11aa22a401058f7f5ebb1fbd6fd6c9ec3b93.tar.bz2
merge 3.4
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socket.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 7b93d11..563bc8d 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1293,9 +1293,10 @@ class GeneralModuleTests(unittest.TestCase):
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')