Move server implementation to server.py (#866)

* Move server implementation to server.py * Lint
encode · Nov 25, 2020 · f1bcade · f1bcade
1 parent 16d12f3
commit f1bcade
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/uvicorn/_impl/__init__.py b/uvicorn/_impl/__init__.py
diff --git a/uvicorn/main.py b/uvicorn/main.py
@@ -7,7 +7,6 @@
 import click
 
 import uvicorn
-from uvicorn._impl.asyncio import AsyncioServer, AsyncioServerState
 from uvicorn.config import (
     HTTP_PROTOCOLS,
     INTERFACES,
@@ -19,6 +18,7 @@
     WS_PROTOCOLS,
     Config,
 )
+from uvicorn.server import Server, ServerState  # noqa: F401  # Used to be defined here.
 from uvicorn.supervisors import ChangeReload, Multiprocess
 
 LEVEL_CHOICES = click.Choice(LOG_LEVELS.keys())
@@ -30,10 +30,6 @@
 
 logger = logging.getLogger("uvicorn.error")
 
-# Aliases for backwards compatibility. These used to be defined here.
-Server = AsyncioServer
-ServerState = AsyncioServerState
-
 
 def print_version(ctx, param, value):
     if not value or ctx.resilient_parsing:

diff --git a/uvicorn/_impl/asyncio.py → uvicorn/server.py b/uvicorn/_impl/asyncio.py → uvicorn/server.py
@@ -19,7 +19,7 @@
 logger = logging.getLogger("uvicorn.error")
 
 
-class AsyncioServerState:
+class ServerState:
     """
     Shared servers state that is available between all protocol instances.
     """
@@ -31,10 +31,10 @@ def __init__(self):
         self.default_headers = []
 
 
-class AsyncioServer:
+class Server:
     def __init__(self, config):
         self.config = config
-        self.server_state = AsyncioServerState()
+        self.server_state = ServerState()
 
         self.started = False
         self.should_exit = False