diff options
| author | Will Hunt <will@half-shot.uk> | 2018-07-27 12:28:08 +0100 |
|---|---|---|
| committer | Will Hunt <will@half-shot.uk> | 2018-07-27 12:28:08 +0100 |
| commit | 0f6e583e6ff598deab41976d16f7ca9eaa97fbd3 (patch) | |
| tree | 555265be5e466a0f4b67203721c125a407f5d614 | |
| parent | Merge remote-tracking branch 'upstream/develop' into hs/upload-limits (diff) | |
| download | synapse-0f6e583e6ff598deab41976d16f7ca9eaa97fbd3.tar.xz | |
isorted this mess
| -rw-r--r-- | synapse/rest/media/v1/config_resource.py | 1 | ||||
| -rw-r--r-- | synapse/rest/media/v1/media_repository.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/config_resource.py b/synapse/rest/media/v1/config_resource.py index 44d3d567aa..d6605b6027 100644 --- a/synapse/rest/media/v1/config_resource.py +++ b/synapse/rest/media/v1/config_resource.py @@ -17,6 +17,7 @@ from twisted.internet import defer from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET + from synapse.http.server import respond_with_json, wrap_json_request_handler diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py index 6a16f9043c..6b08f76e97 100644 --- a/synapse/rest/media/v1/media_repository.py +++ b/synapse/rest/media/v1/media_repository.py @@ -42,6 +42,7 @@ from synapse.util.retryutils import NotRetryingDestination from synapse.util.stringutils import is_ascii, random_string from ._base import FileInfo, respond_404, respond_with_responder +from .config_resource import MediaConfigResource from .download_resource import DownloadResource from .filepath import MediaFilePaths from .identicon_resource import IdenticonResource @@ -51,7 +52,6 @@ from .storage_provider import StorageProviderWrapper from .thumbnail_resource import ThumbnailResource from .thumbnailer import Thumbnailer from .upload_resource import UploadResource -from .config_resource import MediaConfigResource logger = logging.getLogger(__name__) |