summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:15:34 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:15:34 -0700
commit48e7f210c6655b83a2f719acb7f41cf0fece10a1 (patch)
tree961b66bdd6b432bc8af4f8519e4fce81bd2f4863 /synapse/http/server.py
parentMerge commit '98c4e35e3' into dinsic (diff)
parentReplace all remaining six usage with native Python 3 equivalents (#7704) (diff)
downloadsynapse-48e7f210c6655b83a2f719acb7f41cf0fece10a1.tar.xz
Merge commit 'a3f11567d' into dinsic
* commit 'a3f11567d':
  Replace all remaining six usage with native Python 3 equivalents (#7704)
Diffstat (limited to 'synapse/http/server.py')
-rw-r--r--synapse/http/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py

index 2487a72171..6aa1dc1f92 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py
@@ -16,10 +16,10 @@ import collections import html -import http.client import logging import types import urllib +from http import HTTPStatus from io import BytesIO from typing import Awaitable, Callable, TypeVar, Union @@ -188,7 +188,7 @@ def return_html_error( exc_info=(f.type, f.value, f.getTracebackObject()), ) else: - code = http.HTTPStatus.INTERNAL_SERVER_ERROR + code = HTTPStatus.INTERNAL_SERVER_ERROR msg = "Internal server error" logger.error(