fix: rename wakeup to shutdown and states

Author: ordinary-jamie

Lib/asyncio/base_events.py

@@ -276,15 +276,15 @@ async def restore(self):
 class _ServerState(enum.Enum):
     """This tracks the state of Server.
 
-    -[in]->INITIALIZED -[ss]-> SERVING -[cl]-> CLOSED -[wk]*-> SHUTDOWN
+    -[in]->NOT_STARTED -[ss]-> SERVING -[cl]-> CLOSED -[wk]*-> SHUTDOWN
 
     - in: Server.__init__()
     - ss: Server._start_serving()
     - cl: Server.close()
     - wk: Server._wakeup()  *only called if number of clients == 0
     """
 
-    INITIALIZED = "initialized"
+    NOT_STARTED = "not_started"
     SERVING = "serving"
     CLOSED = "closed"
     SHUTDOWN = "shutdown"
@@ -305,7 +305,7 @@ def __init__(self, loop, sockets, protocol_factory, ssl_context, backlog,
         self._ssl_context = ssl_context
         self._ssl_handshake_timeout = ssl_handshake_timeout
         self._ssl_shutdown_timeout = ssl_shutdown_timeout
-        self._state = _ServerState.INITIALIZED
+        self._state = _ServerState.NOT_STARTED
         self._serving_forever_fut = None
 
     def __repr__(self):
@@ -319,9 +319,9 @@ def _attach(self, transport):
     def _detach(self, transport):
         self._clients.discard(transport)
         if self._state == _ServerState.CLOSED and len(self._clients) == 0:
-            self._wakeup()
+            self._shutdown()
 
-    def _wakeup(self):
+    def _shutdown(self):
         if self._state == _ServerState.CLOSED:
             self._state = _ServerState.SHUTDOWN
         elif self._state == _ServerState.SHUTDOWN:
@@ -339,7 +339,7 @@ def _wakeup(self):
                 waiter.set_result(None)
 
     def _start_serving(self):
-        if self._state == _ServerState.INITIALIZED:
+        if self._state == _ServerState.NOT_STARTED:
             self._state = _ServerState.SERVING
         elif self._state == _ServerState.SERVING:
             return
@@ -385,7 +385,7 @@ def close(self):
             self._serving_forever_fut = None
 
         if len(self._clients) == 0:
-            self._wakeup()
+            self._shutdown()
 
     def close_clients(self):
         for transport in self._clients.copy():

Lib/test/test_asyncio/test_server.py

@@ -66,7 +66,7 @@ async def main(srv):
         self.assertIsNone(srv._waiters)
         self.assertFalse(srv.is_serving())
 
-        with self.assertRaisesRegex(RuntimeError, r'is closed'):
+        with self.assertRaisesRegex(RuntimeError, r'started and then closed'):
             self.loop.run_until_complete(srv.serve_forever())
 
 
@@ -119,7 +119,7 @@ async def main(srv):
             self.assertIsNone(srv._waiters)
             self.assertFalse(srv.is_serving())
 
-            with self.assertRaisesRegex(RuntimeError, r'is closed'):
+            with self.assertRaisesRegex(RuntimeError, r'started and then closed'):
                 self.loop.run_until_complete(srv.serve_forever())
 
 
@@ -215,7 +215,7 @@ async def serve(rd, wr):
         await asyncio.sleep(0)
         self.assertTrue(task.done())
 
-        with self.assertRaisesRegex(RuntimeError, r'is closed'):
+        with self.assertRaisesRegex(RuntimeError, r'started and then closed'):
             await srv.start_serving()
 
     async def test_abort_clients(self):