Merged revisions 84089 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84089 | giampaolo.rodola | 2010-08-16 07:08:11 +0200 (lun, 16 ago 2010) | 1 line

  fix getaddrinfo test failure on OSX caused by AI_CANNAME erroneously used as the value for 'proto'
........

Lib/test/test_socket.py

@@ -598,7 +598,7 @@ class GeneralModuleTests(unittest.TestCase):
         for _, socktype, _, _, _ in infos:
             self.assertEqual(socktype, socket.SOCK_STREAM)
         # test proto and flags arguments
-        socket.getaddrinfo(HOST, None, 0, 0, socket.AI_CANONNAME)
+        socket.getaddrinfo(HOST, None, 0, 0, socket.SOL_TCP)
         socket.getaddrinfo(HOST, None, 0, 0, 0, socket.AI_PASSIVE)
         # a server willing to support both IPv4 and IPv6 will
         # usually do this