From cbcbef335150e1992ff0ce7167b89aea3d817726 Mon Sep 17 00:00:00 2001
From: "Gavin M. Roy" <gavinr@aweber.com>
Date: Fri, 4 Dec 2020 13:29:32 -0500
Subject: [PATCH] Tornado HTTPServerRequest.uri is just the path portion of the
 URI

---
 tests/test_requests.py       | 8 ++++++--
 tornado_openapi3/requests.py | 7 +++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/test_requests.py b/tests/test_requests.py
index 2d18ea4..11ef8ab 100644
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Dict, List, Optional
 import unittest
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urlparse
 
 import attr
 from hypothesis import given, settings  # type: ignore
@@ -115,7 +115,11 @@ class TestRequestFactory(unittest.TestCase):
     def test_http_server_request(self, opts) -> None:
         url, parameters = opts
         request_url = f"{url}?{urlencode(parameters)}" if url else ""
-        tornado_request = HTTPServerRequest(method="GET", uri=request_url)
+        parsed = urlparse(request_url)
+        tornado_request = HTTPServerRequest(
+            method="GET", uri=f"{parsed.path}?{parsed.query}")
+        tornado_request.protocol = parsed.scheme
+        tornado_request.host = parsed.netloc.split(':')[0]
         expected = OpenAPIRequest(
             full_url_pattern=url,
             method="get",
diff --git a/tornado_openapi3/requests.py b/tornado_openapi3/requests.py
index 91e135c..c1e79fb 100644
--- a/tornado_openapi3/requests.py
+++ b/tornado_openapi3/requests.py
@@ -25,10 +25,9 @@ class TornadoRequestFactory:
                 path = ""
                 query_arguments = ImmutableMultiDict()
         else:
-            if request.uri:
-                path, _, _ = request.uri.partition("?")
-            else:
-                path = ""
+            path, _, _ = request.full_url().partition("?")
+            if path == '://':
+                path = ''
             query_arguments = ImmutableMultiDict(
                 itertools.chain(
                     *[