Merge pull request #3542 from amn/amn/make-requesthandler-uri-attr-mandatory

Make `uri` and `method` attributes on `HTTPServerRequest` mandatory

Author: bdarnell

tornado/httputil.py

@@ -487,7 +487,9 @@ def __init__(
     ) -> None:
         if start_line is not None:
             method, uri, version = start_line
+        assert method
         self.method = method
+        assert uri
         self.uri = uri
         self.version = version
         self.headers = headers or HTTPHeaders()

tornado/test/httputil_test.py

@@ -526,15 +526,15 @@ def test_default_constructor(self):
         # All parameters are formally optional, but uri is required
         # (and has been for some time).  This test ensures that no
         # more required parameters slip in.
-        HTTPServerRequest(uri="/")
+        HTTPServerRequest(method="GET", uri="/")
 
     def test_body_is_a_byte_string(self):
-        request = HTTPServerRequest(uri="/")
+        request = HTTPServerRequest(method="GET", uri="/")
         self.assertIsInstance(request.body, bytes)
 
     def test_repr_does_not_contain_headers(self):
         request = HTTPServerRequest(
-            uri="/", headers=HTTPHeaders({"Canary": ["Coal Mine"]})
+            method="GET", uri="/", headers=HTTPHeaders({"Canary": ["Coal Mine"]})
         )
         self.assertNotIn("Canary", repr(request))