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

…eam) Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Mar 15, 2018 · 9dad955 · 9dad955
1 parent 2b4a8d5
commit 9dad955
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/nikola/plugins/command/auto/__init__.py b/nikola/plugins/command/auto/__init__.py
@@ -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
 

diff --git a/requirements-extras.txt b/requirements-extras.txt
@@ -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