loop: Make loop.getaddrinfo behave like socket.getaddrinfo in edge cases

Author: 1st1

tests/test_dns.py

@@ -26,13 +26,14 @@ def _test_getaddrinfo(self, *args, **kwargs):
             if err is not None:
                 self.assertEqual(ex.args, err.args)
             else:
-                raise
+                ex.__context__ = err
+                raise ex
+        except OSError as ex:
+            ex.__context__ = err
+            raise ex
         else:
-            if err is not None:
-                self.fail(
-                    'uv failed, but blocking getaddrinfo run without error')
-
-            self.assertEqual(a1, a2)
+            if err is None:
+                self.assertEqual(a1, a2)
 
     def _test_getnameinfo(self, *args, **kwargs):
         err = None
@@ -54,8 +55,7 @@ def _test_getnameinfo(self, *args, **kwargs):
                 raise
         else:
             if err is not None:
-                self.fail(
-                    'uv failed, but blocking getnameinfo run without error')
+                raise err
 
             self.assertEqual(a1, a2)
 
@@ -77,6 +77,24 @@ def test_getaddrinfo_5(self):
     def test_getaddrinfo_6(self):
         self._test_getaddrinfo(_HOST.encode(), str(_PORT).encode())
 
+    def test_getaddrinfo_7(self):
+        self._test_getaddrinfo(None, 0)
+
+    def test_getaddrinfo_8(self):
+        self._test_getaddrinfo('', 0)
+
+    def test_getaddrinfo_9(self):
+        self._test_getaddrinfo(b'', 0)
+
+    def test_getaddrinfo_10(self):
+        self._test_getaddrinfo(None, None)
+
+    def test_getaddrinfo_11(self):
+        self._test_getaddrinfo(_HOST.encode(), str(_PORT))
+
+    def test_getaddrinfo_12(self):
+        self._test_getaddrinfo(_HOST.encode(), str(_PORT).encode())
+
     ######
 
     def test_getnameinfo_1(self):
@@ -117,3 +135,5 @@ async def run():
 
 class Test_AIO_DNS(BaseTestDNS, tb.AIOTestCase):
     pass
+    def test_getaddrinfo_11(self):
+        self._test_getaddrinfo(_HOST.encode(), str(_PORT))

uvloop/dns.pyx

@@ -153,7 +153,27 @@ cdef class AddrInfoRequest(UVRequest):
                   int family, int type, int proto, int flags,
                   object callback):
 
-        cdef int err
+        cdef:
+            int err
+            char *chost
+            char *cport
+
+        if host is None:
+            chost = NULL
+        else:
+            chost = <char*>host
+
+        if port is None:
+            cport = NULL
+        else:
+            cport = <char*>port
+
+        if cport is NULL and chost is NULL:
+            self.on_done()
+            msg = system.gai_strerror(socket_EAI_NONAME).decode('utf-8')
+            ex = socket_gaierror(socket_EAI_NONAME, msg)
+            callback(ex)
+            return
 
         memset(&self.hints, 0, sizeof(system.addrinfo))
         self.hints.ai_flags = flags
@@ -173,8 +193,8 @@ cdef class AddrInfoRequest(UVRequest):
         err = uv.uv_getaddrinfo(loop.uvloop,
                                 <uv.uv_getaddrinfo_t*>self.request,
                                 __on_addrinfo_resolved,
-                                host,
-                                port,
+                                chost,
+                                cport,
                                 &self.hints)
 
         if err < 0:

uvloop/loop.pyx

@@ -497,18 +497,20 @@ cdef class Loop:
                       int proto, int flags,
                       int unpack):
 
-        if port is None:
-            port = 0
         if isinstance(port, str):
             port = port.encode()
         elif isinstance(port, int):
             port = str(port).encode()
-        if not isinstance(port, bytes):
+        if port is not None and not isinstance(port, bytes):
             raise TypeError('port must be a str, bytes or int')
+
         if isinstance(host, str):
             host = host.encode()
-        if not isinstance(host, bytes):
-            raise TypeError('host must be a str or bytes')
+        if host is not None:
+            if not isinstance(host, bytes):
+                raise TypeError('host must be a str or bytes')
+            if host == b'':
+                host = None
 
         fut = self._new_future()