Remove UV prefix from user-facing objects

Author: 1st1

uvloop/handles/pipe.pxd

@@ -1,36 +1,36 @@
-cdef class UVPipeServer(UVStreamServer):
+cdef class UnixServer(UVStreamServer):
 
     cdef bind(self, str path)
     cdef open(self, int sockfd)
 
     @staticmethod
-    cdef UVPipeServer new(Loop loop, object protocol_factory, Server server,
-                          object ssl)
+    cdef UnixServer new(Loop loop, object protocol_factory, Server server,
+                        object ssl)
 
 
-cdef class UVPipeTransport(UVStream):
+cdef class UnixTransport(UVStream):
 
     @staticmethod
-    cdef UVPipeTransport new(Loop loop, object protocol, Server server,
-                             object waiter)
+    cdef UnixTransport new(Loop loop, object protocol, Server server,
+                           object waiter)
 
     cdef open(self, int sockfd)
     cdef connect(self, char* addr)
 
 
-cdef class UVReadPipeTransport(UVStream):
+cdef class ReadUnixTransport(UVStream):
 
     @staticmethod
-    cdef UVReadPipeTransport new(Loop loop, object protocol, Server server,
-                                 object waiter)
+    cdef ReadUnixTransport new(Loop loop, object protocol, Server server,
+                               object waiter)
 
     cdef open(self, int sockfd)
 
 
-cdef class UVWritePipeTransport(UVStream):
+cdef class WriteUnixTransport(UVStream):
 
     @staticmethod
-    cdef UVWritePipeTransport new(Loop loop, object protocol, Server server,
-                                  object waiter)
+    cdef WriteUnixTransport new(Loop loop, object protocol, Server server,
+                                object waiter)
 
     cdef open(self, int sockfd)

uvloop/handles/pipe.pyx

@@ -34,14 +34,14 @@ cdef __pipe_get_socket(UVSocketHandle handle):
 
 
 @cython.no_gc_clear
-cdef class UVPipeServer(UVStreamServer):
+cdef class UnixServer(UVStreamServer):
 
     @staticmethod
-    cdef UVPipeServer new(Loop loop, object protocol_factory, Server server,
+    cdef UnixServer new(Loop loop, object protocol_factory, Server server,
                           object ssl):
 
-        cdef UVPipeServer handle
-        handle = UVPipeServer.__new__(UVPipeServer)
+        cdef UnixServer handle
+        handle = UnixServer.__new__(UnixServer)
         handle._init(loop, protocol_factory, server, ssl)
         __pipe_init_uv_handle(<UVStream>handle, loop)
         return handle
@@ -67,20 +67,20 @@ cdef class UVPipeServer(UVStreamServer):
         self._mark_as_open()
 
     cdef UVStream _make_new_transport(self, object protocol, object waiter):
-        cdef UVPipeTransport tr
-        tr = UVPipeTransport.new(self._loop, protocol, self._server, waiter)
+        cdef UnixTransport tr
+        tr = UnixTransport.new(self._loop, protocol, self._server, waiter)
         return <UVStream>tr
 
 
 @cython.no_gc_clear
-cdef class UVPipeTransport(UVStream):
+cdef class UnixTransport(UVStream):
 
     @staticmethod
-    cdef UVPipeTransport new(Loop loop, object protocol, Server server,
+    cdef UnixTransport new(Loop loop, object protocol, Server server,
                              object waiter):
 
-        cdef UVPipeTransport handle
-        handle = UVPipeTransport.__new__(UVPipeTransport)
+        cdef UnixTransport handle
+        handle = UnixTransport.__new__(UnixTransport)
         handle._init(loop, protocol, server, waiter)
         __pipe_init_uv_handle(<UVStream>handle, loop)
         return handle
@@ -98,13 +98,13 @@ cdef class UVPipeTransport(UVStream):
 
 
 @cython.no_gc_clear
-cdef class UVReadPipeTransport(UVStream):
+cdef class ReadUnixTransport(UVStream):
 
     @staticmethod
-    cdef UVReadPipeTransport new(Loop loop, object protocol, Server server,
+    cdef ReadUnixTransport new(Loop loop, object protocol, Server server,
                                  object waiter):
-        cdef UVReadPipeTransport handle
-        handle = UVReadPipeTransport.__new__(UVReadPipeTransport)
+        cdef ReadUnixTransport handle
+        handle = ReadUnixTransport.__new__(ReadUnixTransport)
         handle._init(loop, protocol, server, waiter)
         __pipe_init_uv_handle(<UVStream>handle, loop)
         return handle
@@ -141,13 +141,13 @@ cdef class UVReadPipeTransport(UVStream):
 
 
 @cython.no_gc_clear
-cdef class UVWritePipeTransport(UVStream):
+cdef class WriteUnixTransport(UVStream):
 
     @staticmethod
-    cdef UVWritePipeTransport new(Loop loop, object protocol, Server server,
+    cdef WriteUnixTransport new(Loop loop, object protocol, Server server,
                                   object waiter):
-        cdef UVWritePipeTransport handle
-        handle = UVWritePipeTransport.__new__(UVWritePipeTransport)
+        cdef WriteUnixTransport handle
+        handle = WriteUnixTransport.__new__(WriteUnixTransport)
 
         # We listen for read events on write-end of the pipe. When
         # the read-end is close, the uv_stream_t.read callback will
@@ -174,7 +174,7 @@ cdef class UVWritePipeTransport(UVStream):
 
 cdef class _PipeConnectRequest(UVRequest):
     cdef:
-        UVPipeTransport transport
+        UnixTransport transport
 
     def __cinit__(self, loop, transport):
         self.request = <uv.uv_req_t*> PyMem_Malloc(sizeof(uv.uv_connect_t))
@@ -194,7 +194,7 @@ cdef class _PipeConnectRequest(UVRequest):
 cdef void __pipe_connect_callback(uv.uv_connect_t* req, int status) with gil:
     cdef:
         _PipeConnectRequest wrapper
-        UVPipeTransport transport
+        UnixTransport transport
 
     wrapper = <_PipeConnectRequest> req.data
     transport = wrapper.transport

uvloop/handles/process.pxd

@@ -42,9 +42,9 @@ cdef class UVProcessTransport(UVProcess):
         object _protocol
         bint _finished
 
-        UVWritePipeTransport stdin
-        UVReadPipeTransport stdout
-        UVReadPipeTransport stderr
+        WriteUnixTransport stdin
+        ReadUnixTransport stdout
+        ReadUnixTransport stderr
 
         object stdin_proto
         object stdout_proto

uvloop/handles/process.pyx

@@ -297,7 +297,7 @@ cdef class UVProcessTransport(UVProcess):
 
                 self.stdin_proto = WriteSubprocessPipeProto(self, 0)
                 waiter = self._loop._new_future()
-                self.stdin = UVWritePipeTransport.new(
+                self.stdin = WriteUnixTransport.new(
                     self._loop, self.stdin_proto, None, waiter)
                 self._init_futs.append(waiter)
                 self.stdin.open(w)
@@ -326,7 +326,7 @@ cdef class UVProcessTransport(UVProcess):
 
                 self.stdout_proto = ReadSubprocessPipeProto(self, 1)
                 waiter = self._loop._new_future()
-                self.stdout = UVReadPipeTransport.new(
+                self.stdout = ReadUnixTransport.new(
                     self._loop, self.stdout_proto, None, waiter)
                 self._init_futs.append(waiter)
                 self.stdout.open(r)
@@ -349,7 +349,7 @@ cdef class UVProcessTransport(UVProcess):
 
                 self.stderr_proto = ReadSubprocessPipeProto(self, 2)
                 waiter = self._loop._new_future()
-                self.stderr = UVReadPipeTransport.new(
+                self.stderr = ReadUnixTransport.new(
                     self._loop, self.stderr_proto, None, waiter)
                 self._init_futs.append(waiter)
                 self.stderr.open(r)

uvloop/handles/stream.pyx

@@ -420,7 +420,7 @@ cdef void __uv_stream_on_read(uv.uv_stream_t* stream,
 
         if sc.__read_error_close:
             # Used for getting notified when a pipe is closed.
-            # See UVWritePipeTransport for the explanation.
+            # See WriteUnixTransport for the explanation.
             sc._on_eof()
             return
 

uvloop/handles/streamserver.pyx

@@ -28,7 +28,7 @@ cdef class UVStreamServer(UVSocketHandle):
             raise RuntimeError('unable to listen(); no protocol_factory')
 
         if self.opened != 1:
-            raise RuntimeError('unopened UVTCPServer')
+            raise RuntimeError('unopened TCPServer')
 
         err = uv.uv_listen(<uv.uv_stream_t*> self._handle,
                            backlog,

uvloop/handles/tcp.pxd

@@ -1,17 +1,17 @@
-cdef class UVTCPServer(UVStreamServer):
+cdef class TCPServer(UVStreamServer):
     cdef open(self, int sockfd)
     cdef bind(self, system.sockaddr* addr, unsigned int flags=*)
 
     @staticmethod
-    cdef UVTCPServer new(Loop loop, object protocol_factory, Server server,
-                         object ssl)
+    cdef TCPServer new(Loop loop, object protocol_factory, Server server,
+                       object ssl)
 
 
-cdef class UVTCPTransport(UVStream):
+cdef class TCPTransport(UVStream):
     cdef bind(self, system.sockaddr* addr, unsigned int flags=*)
     cdef open(self, int sockfd)
     cdef connect(self, system.sockaddr* addr)
 
     @staticmethod
-    cdef UVTCPTransport new(Loop loop, object protocol, Server server,
-                            object waiter)
+    cdef TCPTransport new(Loop loop, object protocol, Server server,
+                          object waiter)

uvloop/handles/tcp.pyx

@@ -52,14 +52,14 @@ cdef __tcp_get_socket(UVSocketHandle handle):
 
 
 @cython.no_gc_clear
-cdef class UVTCPServer(UVStreamServer):
+cdef class TCPServer(UVStreamServer):
 
     @staticmethod
-    cdef UVTCPServer new(Loop loop, object protocol_factory, Server server,
+    cdef TCPServer new(Loop loop, object protocol_factory, Server server,
                          object ssl):
 
-        cdef UVTCPServer handle
-        handle = UVTCPServer.__new__(UVTCPServer)
+        cdef TCPServer handle
+        handle = TCPServer.__new__(TCPServer)
         handle._init(loop, protocol_factory, server, ssl)
         __tcp_init_uv_handle(<UVStream>handle, loop)
         return handle
@@ -86,20 +86,20 @@ cdef class UVTCPServer(UVStreamServer):
             self._mark_as_open()
 
     cdef UVStream _make_new_transport(self, object protocol, object waiter):
-        cdef UVTCPTransport tr
-        tr = UVTCPTransport.new(self._loop, protocol, self._server, waiter)
+        cdef TCPTransport tr
+        tr = TCPTransport.new(self._loop, protocol, self._server, waiter)
         return <UVStream>tr
 
 
 @cython.no_gc_clear
-cdef class UVTCPTransport(UVStream):
+cdef class TCPTransport(UVStream):
 
     @staticmethod
-    cdef UVTCPTransport new(Loop loop, object protocol, Server server,
+    cdef TCPTransport new(Loop loop, object protocol, Server server,
                             object waiter):
 
-        cdef UVTCPTransport handle
-        handle = UVTCPTransport.__new__(UVTCPTransport)
+        cdef TCPTransport handle
+        handle = TCPTransport.__new__(TCPTransport)
         handle._init(loop, protocol, server, waiter)
         __tcp_init_uv_handle(<UVStream>handle, loop)
         return handle
@@ -123,7 +123,7 @@ cdef class UVTCPTransport(UVStream):
 
 cdef class _TCPConnectRequest(UVRequest):
     cdef:
-        UVTCPTransport transport
+        TCPTransport transport
 
     def __cinit__(self, loop, transport):
         self.request = <uv.uv_req_t*> PyMem_Malloc(sizeof(uv.uv_connect_t))
@@ -148,7 +148,7 @@ cdef class _TCPConnectRequest(UVRequest):
 cdef void __tcp_connect_callback(uv.uv_connect_t* req, int status) with gil:
     cdef:
         _TCPConnectRequest wrapper
-        UVTCPTransport transport
+        TCPTransport transport
 
     wrapper = <_TCPConnectRequest> req.data
     transport = wrapper.transport

uvloop/handles/udp.pxd

@@ -1,4 +1,4 @@
-cdef class UVUDP(UVBaseTransport):
+cdef class UDPTransport(UVBaseTransport):
     cdef:
         bint __receiving
         int _family

uvloop/handles/udp.pyx

@@ -9,7 +9,7 @@ cdef class _UDPSendContext:
         uv.uv_buf_t     uv_buf
         Py_buffer       py_buf
 
-        UVUDP           udp
+        UDPTransport    udp
 
         bint            closed
 
@@ -26,7 +26,7 @@ cdef class _UDPSendContext:
         self.udp = None
 
     @staticmethod
-    cdef _UDPSendContext new(UVUDP udp, object data):
+    cdef _UDPSendContext new(UDPTransport udp, object data):
         cdef _UDPSendContext ctx
         ctx = _UDPSendContext.__new__(_UDPSendContext)
         ctx.udp = None
@@ -51,7 +51,7 @@ cdef class _UDPSendContext:
 
 
 @cython.no_gc_clear
-cdef class UVUDP(UVBaseTransport):
+cdef class UDPTransport(UVBaseTransport):
     def __cinit__(self):
         self._family = uv.AF_UNSPEC
         self._address_set = 0
@@ -150,7 +150,7 @@ cdef class UVUDP(UVBaseTransport):
             self._fatal_error(exc, True)
             return
         else:
-            # UVUDP must live until the read callback is called
+            # UDPTransport must live until the read callback is called
             self.__receiving_started()
 
     cdef _stop_reading(self):
@@ -184,7 +184,7 @@ cdef class UVUDP(UVBaseTransport):
     cdef _new_socket(self):
         if self._family not in (uv.AF_INET, uv.AF_INET6):
             raise RuntimeError(
-                'UVUDP.family is undefined; cannot create python socket')
+                'UDPTransport.family is undefined; cannot create python socket')
 
         fileno = self._fileno()
         return socket_socket(self._family, uv.SOCK_STREAM, 0, fileno)
@@ -194,7 +194,7 @@ cdef class UVUDP(UVBaseTransport):
             _UDPSendContext ctx
 
         if self._family not in (uv.AF_INET, uv.AF_INET6):
-            raise RuntimeError('UVUDP.family is undefined; cannot send')
+            raise RuntimeError('UDPTransport.family is undefined; cannot send')
 
         if self._address_set and addr is not None:
             if self._cached_py_address is None:
@@ -275,11 +275,11 @@ cdef void __uv_udp_on_receive(uv.uv_udp_t* handle,
                               unsigned flags) with gil:
 
     if __ensure_handle_data(<uv.uv_handle_t*>handle,
-                            "UVUDP receive callback") == 0:
+                            "UDPTransport receive callback") == 0:
         return
 
     cdef:
-        UVUDP udp = <UVUDP>handle.data
+        UDPTransport udp = <UDPTransport>handle.data
         Loop loop = udp._loop
         bytes data
         object pyaddr
@@ -344,15 +344,15 @@ cdef void __uv_udp_on_send(uv.uv_udp_send_t* req, int status) with gil:
     if req.data is NULL:
         # Shouldn't happen as:
         #    - _UDPSendContext does an extra INCREF in its 'init()'
-        #    - _UDPSendContext holds a ref to the relevant UVUDP
+        #    - _UDPSendContext holds a ref to the relevant UDPTransport
         aio_logger.error(
             'UVStream.write callback called with NULL req.data, status=%r',
             status)
         return
 
     cdef:
         _UDPSendContext ctx = <_UDPSendContext> req.data
-        UVUDP udp = <UVUDP>ctx.udp
+        UDPTransport udp = <UDPTransport>ctx.udp
 
     ctx.close()