Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix middleware traceback fetching on Python 3.8+, fix ResourceWarnings in TestClient, fix CI build #1132

Merged
merged 3 commits into from
Jan 31, 2021
Merged

Fix middleware traceback fetching on Python 3.8+, fix ResourceWarnings in TestClient, fix CI build #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fd70c8
Add __init__ file for tests.middleware so Mypy 0.800 is happy
JayH5 Jan 30, 2021
3bd3e6b
testclient: Tie loop lifetime to thread
JayH5 Jan 30, 2021
aa97f30
ServerErrorMiddleware: Don't use undocumented TracebackException.exc_…
JayH5 Jan 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions starlette/middleware/errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,15 @@ def generate_html(self, exc: Exception, limit: int = 7) -> str:
traceback_obj = traceback.TracebackException.from_exception(
exc, capture_locals=True
)
frames = inspect.getinnerframes(
traceback_obj.exc_traceback, limit # type: ignore
)

exc_html = ""
is_collapsed = False
for frame in reversed(frames):
exc_html += self.generate_frame_html(frame, is_collapsed)
is_collapsed = True
exc_traceback = exc.__traceback__
if exc_traceback is not None:
frames = inspect.getinnerframes(exc_traceback, limit)
for frame in reversed(frames):
exc_html += self.generate_frame_html(frame, is_collapsed)
is_collapsed = True

# escape error class and text
error = (
Expand Down
6 changes: 4 additions & 2 deletions starlette/testclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ def __init__(self, app: ASGI3App, scope: Scope) -> None:
self.app = app
self.scope = scope
self.accepted_subprotocol = None
self._loop = asyncio.new_event_loop()
self._receive_queue = queue.Queue() # type: queue.Queue
self._send_queue = queue.Queue() # type: queue.Queue
self._thread = threading.Thread(target=self._run)
Expand All @@ -293,13 +292,16 @@ def _run(self) -> None:
"""
The sub-thread in which the websocket session runs.
"""
loop = asyncio.new_event_loop()
scope = self.scope
receive = self._asgi_receive
send = self._asgi_send
try:
self._loop.run_until_complete(self.app(scope, receive, send))
loop.run_until_complete(self.app(scope, receive, send))
except BaseException as exc:
self._send_queue.put(exc)
finally:
loop.close()

async def _asgi_receive(self) -> Message:
while self._receive_queue.empty():
Expand Down
Empty file added tests/middleware/__init__.py
View file
Open in desktop
Empty file.