Merge branch '2.3'

CHANGES.rst

@@ -14,6 +14,11 @@ Changelog
 
 .. towncrier release notes start
 
+2.3.9 (2018-01-16)
+==================
+
+- Fix colon handing in path for dynamic resources (#2670)
+
 2.3.8 (2018-01-15)
 ==================
 

aiohttp/web_urldispatcher.py

@@ -404,7 +404,8 @@ def _match(self, path):
         if match is None:
             return None
         else:
-            return {key: URL(value, encoded=True).path for key, value in
+            return {key: URL.build(path=value, encoded=True).path
+                    for key, value in
                     match.groupdict().items()}
 
     def raw_match(self, path):

tests/test_urldispatch.py

@@ -102,6 +102,17 @@ async def test_add_with_matchdict(router):
     assert info.route.name is None
 
 
+async def test_add_with_matchdict_with_colon(router):
+    handler = make_handler()
+    router.add_route('GET', '/handler/{to}', handler)
+    req = make_request('GET', '/handler/1:2:3')
+    info = await router.resolve(req)
+    assert info is not None
+    assert {'to': '1:2:3'} == info
+    assert handler is info.handler
+    assert info.route.name is None
+
+
 async def test_add_route_with_add_get_shortcut(router):
     handler = make_handler()
     router.add_get('/handler/to/path', handler)