From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 3 Nov 2014 20:11:53 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.4.3rc1~362^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97751fa5c985055cd10e789702fdc33f0d30b8ad;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

97751fa5c985055cd10e789702fdc33f0d30b8ad
diff --cc Lib/test/test_socket.py
index 450aee1d4334,ea5241978328..ee4aea37faff
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@@ -1181,16 -773,12 +1181,17 @@@ class GeneralModuleTests(unittest.TestC
      @unittest.skipUnless(support.is_resource_enabled('network'),
                           'network is not enabled')
      def test_idna(self):
 -        support.requires('network')
 +        # Check for internet access before running test (issue #12804).
 +        try:
 +            socket.gethostbyname('python.org')
 +        except socket.gaierror as e:
 +            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')