Make sure that getaddrinfo() accepts bytes (as asyncio/socket version)

Author: 1st1

tests/test_dns.py

@@ -46,7 +46,9 @@ def _test_getnameinfo(self, *args, **kwargs):
                 self.loop.getnameinfo(*args, **kwargs))
         except Exception as ex:
             if err is not None:
-                self.assertEqual(ex.__class__, err.__class__)
+                if ex.__class__ is not err.__class__:
+                    print(ex, err)
+                self.assertIs(ex.__class__, err.__class__)
                 self.assertEqual(ex.args, err.args)
             else:
                 raise
@@ -69,6 +71,12 @@ def test_getaddrinfo_3(self):
     def test_getaddrinfo_4(self):
         self._test_getaddrinfo(_HOST, _PORT, family=-1)
 
+    def test_getaddrinfo_5(self):
+        self._test_getaddrinfo(_HOST, str(_PORT))
+
+    def test_getaddrinfo_6(self):
+        self._test_getaddrinfo(_HOST.encode(), str(_PORT).encode())
+
     ######
 
     def test_getnameinfo_1(self):

uvloop/dns.pyx

@@ -43,7 +43,6 @@ cdef __convert_pyaddr_to_sockaddr(int family, object addr,
                                   system.sockaddr* res):
     cdef:
         int err
-        int port
         int addr_len
         int scope_id = 0
         int flowinfo = 0
@@ -58,8 +57,12 @@ cdef __convert_pyaddr_to_sockaddr(int family, object addr,
             host = host.encode()
         if not isinstance(host, (bytes, bytearray)):
             raise TypeError('host must be a string or bytes object')
+        if isinstance(port, bytes):
+            port = port.decode()
+        if isinstance(port, str):
+            port = int(port)
 
-        err = uv.uv_ip4_addr(host, port, <system.sockaddr_in*>res)
+        err = uv.uv_ip4_addr(host, <int>port, <system.sockaddr_in*>res)
         if err < 0:
             raise convert_error(err)
 
@@ -146,7 +149,7 @@ cdef class AddrInfoRequest(UVRequest):
         object callback
 
     def __cinit__(self, Loop loop,
-                  str host, int port,
+                  bytes host, bytes port,
                   int family, int type, int proto, int flags,
                   object callback):
 
@@ -170,8 +173,8 @@ cdef class AddrInfoRequest(UVRequest):
         err = uv.uv_getaddrinfo(loop.uvloop,
                                 <uv.uv_getaddrinfo_t*>self.request,
                                 __on_addrinfo_resolved,
-                                host.encode('utf-8'),
-                                str(port).encode('latin-1'),
+                                host,
+                                port,
                                 &self.hints)
 
         if err < 0:

uvloop/loop.pxd

@@ -136,7 +136,7 @@ cdef class Loop:
     cdef inline _check_closed(self)
     cdef inline _check_thread(self)
 
-    cdef _getaddrinfo(self, str host, int port,
+    cdef _getaddrinfo(self, object host, object port,
                       int family, int type,
                       int proto, int flags,
                       int unpack)

uvloop/loop.pyx

@@ -489,11 +489,22 @@ cdef class Loop:
             self._polls_gc[fd] = poll
         return result
 
-    cdef _getaddrinfo(self, str host, int port,
+    cdef _getaddrinfo(self, object host, object port,
                       int family, int type,
                       int proto, int flags,
                       int unpack):
 
+        if isinstance(port, str):
+            port = port.encode()
+        elif isinstance(port, int):
+            port = str(port).encode()
+        if 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')
+
         fut = self._new_future()
 
         def callback(result):
@@ -895,7 +906,7 @@ cdef class Loop:
 
         return future.result()
 
-    def getaddrinfo(self, str host, int port, *,
+    def getaddrinfo(self, object host, object port, *,
                     int family=0, int type=0, int proto=0, int flags=0):
 
         return self._getaddrinfo(host, port, family, type, proto, flags, 1)
@@ -915,14 +926,6 @@ cdef class Loop:
         if sl < 2 or sl > 4:
             raise ValueError('sockaddr must be a tuple of 2, 3 or 4 values')
 
-        host = sockaddr[0]
-        if not isinstance(host, str):
-            raise TypeError('host must be a string')
-
-        port = sockaddr[1]
-        if not isinstance(port, int):
-            raise TypeError('port must be an int')
-
         if sl > 2:
             flowinfo = sockaddr[2]
             if flowinfo < 0 or flowinfo > 0xfffff:
@@ -940,7 +943,7 @@ cdef class Loop:
             scope_id = 0
 
         ai_cnt = await self._getaddrinfo(
-            host, port,
+            sockaddr[0], sockaddr[1],
             uv.AF_UNSPEC,         # family
             uv.SOCK_DGRAM,        # type
             0,                    # proto