Skip to content
Permalink
Browse files

Fix #2986 -- make auto work by not using yarl.unquote (to match upstr…

…eam)

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Mar 15, 2018
1 parent 2b4a8d5 commit 9dad95568d36f33df19f561838251188b0769bec
Showing with 3 additions and 4 deletions.
  1. +2 −3 nikola/plugins/command/auto/__init__.py
  2. +1 −1 requirements-extras.txt
@@ -38,12 +38,11 @@
import aiohttp
from aiohttp import web
from aiohttp.web_urldispatcher import StaticResource
from yarl import unquote
from aiohttp.web_exceptions import HTTPNotFound, HTTPForbidden
from aiohttp.web_response import Response
from aiohttp.web_fileresponse import FileResponse
except ImportError:
aiohttp = web = unquote = None
aiohttp = web = None
StaticResource = HTTPNotFound = HTTPForbidden = Response = FileResponse = object

try:
@@ -409,7 +408,7 @@ def __init__(self, modify_html=True, snippet="</head>", *args, **kwargs):
@asyncio.coroutine
def _handle(self, request):
"""Handle incoming requests (pass to handle_file)."""
filename = unquote(request.match_info['filename'])
filename = request.match_info['filename']
ret = yield from self.handle_file(request, filename)
return ret

@@ -10,7 +10,7 @@ webassets>=0.10.1
notebook>=4.0.0
ipykernel>=4.0.0
ghp-import2>=1.0.0
aiohttp>=2.2.0
aiohttp>=2.3.8
watchdog>=0.8.3
PyYAML==3.12
toml>=0.9.2

0 comments on commit 9dad955

Please sign in to comment.