Typing fixes

starlette/endpoints.py

@@ -10,6 +10,14 @@
 from starlette.types import Message, Receive, Scope, Send
 from starlette.websockets import WebSocket
 
+if False:  # TYPE_CHECKING
+    import sys
+
+    if sys.version_info >= (3, 8):
+        from typing import Literal
+    else:
+        from typing_extensions import Literal
+
 
 class HTTPEndpoint:
     def __init__(self, scope: Scope, receive: Receive, send: Send) -> None:
@@ -43,7 +51,7 @@ async def method_not_allowed(self, request: Request) -> Response:
 
 class WebSocketEndpoint:
 
-    encoding = None  # May be "text", "bytes", or "json".
+    encoding = None  # type: typing.Optional[Literal["text", "bytes", "json"]]
 
     def __init__(self, scope: Scope, receive: Receive, send: Send) -> None:
         assert scope["type"] == "websocket"

starlette/routing.py

@@ -477,7 +477,7 @@ async def not_found(self, scope: Scope, receive: Receive, send: Send) -> None:
             response = PlainTextResponse("Not Found", status_code=404)
         await response(scope, receive, send)
 
-    def url_path_for(self, name: str, **path_params: str) -> URLPath:
+    def url_path_for(self, name: str, **path_params: typing.Any) -> URLPath:
         for route in self.routes:
             try:
                 return route.url_path_for(name, **path_params)

starlette/testclient.py

@@ -449,7 +449,7 @@ def websocket_connect(
 
         return session
 
-    def __enter__(self) -> requests.Session:
+    def __enter__(self) -> "TestClient":
         loop = asyncio.get_event_loop()
         self.send_queue = asyncio.Queue()  # type: asyncio.Queue
         self.receive_queue = asyncio.Queue()  # type: asyncio.Queue

tests/test_database.py

@@ -75,6 +75,7 @@ async def read_note(request):
     note_id = request.path_params["note_id"]
     query = notes.select().where(notes.c.id == note_id)
     result = await database.fetch_one(query)
+    assert result
     content = {"text": result["text"], "completed": result["completed"]}
     return JSONResponse(content)
 
@@ -84,6 +85,7 @@ async def read_note_text(request):
     note_id = request.path_params["note_id"]
     query = sqlalchemy.select([notes.c.text]).where(notes.c.id == note_id)
     result = await database.fetch_one(query)
+    assert result
     return JSONResponse(result[0])
 
 

tests/test_datastructures.py

@@ -8,6 +8,7 @@
     MultiDict,
     MutableHeaders,
     QueryParams,
+    UploadFile,
 )
 
 
@@ -211,7 +212,7 @@ def test_queryparams():
 
 
 def test_formdata():
-    upload = io.BytesIO(b"test")
+    upload = UploadFile("upload", io.BytesIO(b"test"))
     form = FormData([("a", "123"), ("a", "456"), ("b", upload)])
     assert "a" in form
     assert "A" not in form

tests/test_formparsers.py

@@ -1,4 +1,5 @@
 import os
+import typing
 
 from starlette.formparsers import UploadFile, _user_safe_decode
 from starlette.requests import Request
@@ -22,6 +23,7 @@ async def app(scope, receive, send):
     for key, value in data.items():
         if isinstance(value, UploadFile):
             content = await value.read()
+            assert isinstance(content, bytes)
             output[key] = {
                 "filename": value.filename,
                 "content": content.decode(),
@@ -37,7 +39,7 @@ async def app(scope, receive, send):
 async def multi_items_app(scope, receive, send):
     request = Request(scope, receive)
     data = await request.form()
-    output = {}
+    output: typing.Dict[str, typing.List] = {}
     for key, value in data.multi_items():
         if key not in output:
             output[key] = []

tests/test_routing.py

@@ -346,13 +346,13 @@ async def subdomain_app(scope, receive, send):
     await response(scope, receive, send)
 
 
-subdomain_app = Router(
+subdomain_router = Router(
     routes=[Host("{subdomain}.example.org", app=subdomain_app, name="subdomains")]
 )
 
 
 def test_subdomain_routing():
-    client = TestClient(subdomain_app, base_url="https://foo.example.org/")
+    client = TestClient(subdomain_router, base_url="https://foo.example.org/")
 
     response = client.get("/")
     assert response.status_code == 200
@@ -361,7 +361,7 @@ def test_subdomain_routing():
 
 def test_subdomain_reverse_urls():
     assert (
-        subdomain_app.url_path_for(
+        subdomain_router.url_path_for(
             "subdomains", subdomain="foo", path="/homepage"
         ).make_absolute_url("https://whatever")
         == "https://foo.example.org/homepage"
@@ -403,7 +403,9 @@ def test_url_for_with_root_path():
 
 
 double_mount_routes = [
-    Mount("/mount", name="mount", routes=[Mount("/static", ..., name="static")],),
+    Mount(
+        "/mount", name="mount", routes=[Mount("/static", Starlette(), name="static")],
+    ),
 ]
 
 

tests/test_templates.py

@@ -22,11 +22,11 @@ async def homepage(request):
     client = TestClient(app)
     response = client.get("/")
     assert response.text == "<html>Hello, <a href='http://testserver/'>world</a></html>"
-    assert response.template.name == "index.html"
-    assert set(response.context.keys()) == {"request"}
+    assert response.template.name == "index.html"  # type: ignore
+    assert set(response.context.keys()) == {"request"}  # type: ignore
 
 
 def test_template_response_requires_request(tmpdir):
     templates = Jinja2Templates(str(tmpdir))
     with pytest.raises(ValueError):
-        templates.TemplateResponse(None, {})
+        templates.TemplateResponse("name", {})