Factor out UVStreamServer into separate files

Author: 1st1

uvloop/handles/server.pxd

@@ -0,0 +1,15 @@
+cdef class UVStreamServer(UVStream):
+    cdef:
+        object ssl
+        object protocol_factory
+        bint opened
+        Server _server
+
+    cdef _init(self, Loop loop, object protocol_factory, Server server,
+               object ssl)
+
+    cdef inline _mark_as_open(self)
+
+    cdef listen(self, int backlog=?)
+    cdef _on_listen(self)
+    cdef UVTransport _make_new_transport(self, object protocol, object waiter)

uvloop/handles/server.pyx

@@ -0,0 +1,60 @@
+@cython.no_gc_clear
+cdef class UVStreamServer(UVStream):
+
+    cdef _init(self, Loop loop, object protocol_factory, Server server,
+               object ssl):
+
+        if ssl is not None and not isinstance(ssl, ssl_SSLContext):
+            raise TypeError(
+                'ssl is expected to be None or an instance of '
+                'ssl.SSLContext, got {!r}'.format(ssl))
+        self.ssl = ssl
+
+        self._start_init(loop)
+        self.protocol_factory = protocol_factory
+        self._server = server
+        self.opened = 0
+
+    cdef listen(self, int backlog=100):
+        if self.protocol_factory is None:
+            raise RuntimeError('unable to listen(); no protocol_factory')
+
+        if self.opened != 1:
+            raise RuntimeError('unopened UVTCPServer')
+
+        self._listen(backlog)
+
+    cdef _on_listen(self):
+        # Implementation for UVStream._on_listen
+
+        protocol = self.protocol_factory()
+
+        if self.ssl is None:
+            client = self._make_new_transport(protocol, None)
+
+        else:
+            waiter = aio_Future(loop=self._loop)
+
+            ssl_protocol = aio_SSLProtocol(
+                self._loop, protocol, self.ssl,
+                waiter,
+                True,  # server_side
+                None)  # server_hostname
+
+            client = self._make_new_transport(ssl_protocol, None)
+
+            waiter.add_done_callback(
+                ft_partial(self.__on_ssl_connected, client))
+
+        client._accept(<UVStream>self)
+
+    cdef inline _mark_as_open(self):
+        self.opened = 1
+
+    cdef UVTransport _make_new_transport(self, object protocol, object waiter):
+        raise NotImplementedError
+
+    def __on_ssl_connected(self, transport, fut):
+        exc = fut.exception()
+        if exc is not None:
+            transport._force_close(exc)

uvloop/handles/stream.pxd

@@ -41,20 +41,3 @@ cdef class UVStream(UVHandle):
     cdef _on_eof(self)
     cdef _on_write(self)
     cdef _on_shutdown(self)
-
-
-cdef class UVStreamServer(UVStream):
-    cdef:
-        object ssl
-        object protocol_factory
-        bint opened
-        Server _server
-
-    cdef _init(self, Loop loop, object protocol_factory, Server server,
-               object ssl)
-
-    cdef inline _mark_as_open(self)
-
-    cdef listen(self, int backlog=?)
-    cdef _on_listen(self)
-    cdef UVTransport _make_new_transport(self, object protocol, object waiter)

uvloop/handles/stream.pyx

@@ -291,68 +291,6 @@ cdef class UVStream(UVHandle):
             id(self))
 
 
-@cython.no_gc_clear
-cdef class UVStreamServer(UVStream):
-
-    cdef _init(self, Loop loop, object protocol_factory, Server server,
-               object ssl):
-
-        if ssl is not None and not isinstance(ssl, ssl_SSLContext):
-            raise TypeError(
-                'ssl is expected to be None or an instance of '
-                'ssl.SSLContext, got {!r}'.format(ssl))
-        self.ssl = ssl
-
-        self._start_init(loop)
-        self.protocol_factory = protocol_factory
-        self._server = server
-        self.opened = 0
-
-    cdef listen(self, int backlog=100):
-        if self.protocol_factory is None:
-            raise RuntimeError('unable to listen(); no protocol_factory')
-
-        if self.opened != 1:
-            raise RuntimeError('unopened UVTCPServer')
-
-        self._listen(backlog)
-
-    cdef _on_listen(self):
-        # Implementation for UVStream._on_listen
-
-        protocol = self.protocol_factory()
-
-        if self.ssl is None:
-            client = self._make_new_transport(protocol, None)
-
-        else:
-            waiter = aio_Future(loop=self._loop)
-
-            ssl_protocol = aio_SSLProtocol(
-                self._loop, protocol, self.ssl,
-                waiter,
-                True,  # server_side
-                None)  # server_hostname
-
-            client = self._make_new_transport(ssl_protocol, None)
-
-            waiter.add_done_callback(
-                ft_partial(self.__on_ssl_connected, client))
-
-        client._accept(<UVStream>self)
-
-    cdef inline _mark_as_open(self):
-        self.opened = 1
-
-    cdef UVTransport _make_new_transport(self, object protocol, object waiter):
-        raise NotImplementedError
-
-    def __on_ssl_connected(self, transport, fut):
-        exc = fut.exception()
-        if exc is not None:
-            transport._force_close(exc)
-
-
 cdef void __uv_stream_on_shutdown(uv.uv_shutdown_t* req,
                                   int status) with gil:
 

uvloop/loop.pxd

@@ -165,6 +165,7 @@ include "handles/timer.pxd"
 include "handles/signal.pxd"
 include "handles/poll.pxd"
 include "handles/stream.pxd"
+include "handles/server.pxd"
 include "handles/transport.pxd"
 include "handles/tcp.pxd"
 include "handles/pipe.pxd"

uvloop/loop.pyx

@@ -1597,6 +1597,7 @@ include "handles/timer.pyx"
 include "handles/signal.pyx"
 include "handles/poll.pyx"
 include "handles/stream.pyx"
+include "handles/server.pyx"
 include "handles/transport.pyx"
 include "handles/tcp.pyx"
 include "handles/pipe.pyx"