Refactor http CachingStaticResource (#21062)

* Simplify http.CachingStaticResource implementation

* Sync up CachingStaticResource._handle() implementation from aiohttp

* Ignore pylint duplicate-base warning

* Try to disable pylint for http/static.py

Caused by https://github.com/PyCQA/astroid/issues/633#issuecomment-463879288

* Remove pylint ignore

* Ignore pylint duplicate-base warning
This commit is contained in:
Jason Hu authored and Paulus Schoutsen committed 2019-02-15 09:31:54 -08:00
1 parent 383813bfe6
commit 46efc0eafb
2 files changed
+20 -30

No files matched your search

+2 -3
View File
@@ -16,13 +16,12 @@ import homeassistant.util as hass_util
from homeassistant.util import ssl as ssl_util
from homeassistant.util.logging import HideSensitiveDataFilter
# Import as alias
from .auth import setup_auth
from .ban import setup_bans
from .const import KEY_AUTHENTICATED, KEY_REAL_IP # noqa
from .cors import setup_cors
from .real_ip import setup_real_ip
from .static import CachingFileResponse, CachingStaticResource
from .static import CACHE_HEADERS, CachingStaticResource
from .view import HomeAssistantView # noqa
REQUIREMENTS = ['aiohttp_cors==0.7.0']
@@ -272,7 +271,7 @@ class HomeAssistantHTTP:
if cache_headers:
async def serve_file(request):
"""Serve file from disk."""
return CachingFileResponse(path)
return web.FileResponse(path, headers=CACHE_HEADERS)
else:
async def serve_file(request):
"""Serve file from disk."""