From e0dbab42d162a7462011c3a0e8b14e5343862031 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 10 Nov 2017 10:01:12 +0200
Subject: [PATCH 1/2] Drop deprecated route.url()

---
 aiohttp/web_urldispatcher.py    | 49 ------------------
 docs/web_reference.rst          | 13 -----
 tests/test_urldispatch.py       | 90 ++++++++-------------------------
 tests/test_web_urldispatcher.py |  2 -
 4 files changed, 21 insertions(+), 133 deletions(-)

diff --git a/aiohttp/web_urldispatcher.py b/aiohttp/web_urldispatcher.py
index 827dfb2ef4c..6cdf604e9d1 100644
--- a/aiohttp/web_urldispatcher.py
+++ b/aiohttp/web_urldispatcher.py
@@ -66,17 +66,6 @@ def __init__(self, *, name=None):
     def name(self):
         return self._name
 
-    @abc.abstractmethod  # pragma: no branch
-    def url(self, **kwargs):
-        """Construct url for resource with additional params.
-
-        Deprecated, use url_for() instead.
-
-        """
-        warnings.warn(".url(...) is deprecated, use .url_for instead",
-                      DeprecationWarning,
-                      stacklevel=3)
-
     @abc.abstractmethod  # pragma: no branch
     def url_for(self, **kwargs):
         """Construct url for resource with additional params."""
@@ -171,17 +160,6 @@ def get_info(self):
     def url_for(self, *args, **kwargs):
         """Construct url for route with additional params."""
 
-    @abc.abstractmethod  # pragma: no branch
-    def url(self, **kwargs):
-        """Construct url for resource with additional params.
-
-        Deprecated, use url_for() instead.
-
-        """
-        warnings.warn(".url(...) is deprecated, use .url_for instead",
-                      DeprecationWarning,
-                      stacklevel=3)
-
     async def handle_expect_header(self, request):
         return await self._expect_handler(request)
 
@@ -334,10 +312,6 @@ def _match(self, path):
     def get_info(self):
         return {'path': self._path}
 
-    def url(self, *, query=None):
-        super().url()
-        return str(self.url_for().with_query(query))
-
     def url_for(self):
         return URL(self._path)
 
@@ -411,10 +385,6 @@ def url_for(self, **parts):
         url = self._formatter.format_map(parts)
         return URL(url)
 
-    def url(self, *, parts, query=None):
-        super().url(**parts)
-        return str(self.url_for(**parts).with_query(query))
-
     def __repr__(self):
         name = "'" + self.name + "' " if self.name is not None else ""
         return ("<DynamicResource {name} {formatter}"
@@ -467,12 +437,6 @@ def __init__(self, prefix, directory, *, name=None,
                         'HEAD': ResourceRoute('HEAD', self._handle, self,
                                               expect_handler=expect_handler)}
 
-    def url(self, *, filename, append_version=None, query=None):
-        url = self.url_for(filename=filename, append_version=append_version)
-        if query is not None:
-            return str(url.update_query(query))
-        return str(url)
-
     def url_for(self, *, filename, append_version=None):
         if append_version is None:
             append_version = self._append_version
@@ -629,11 +593,6 @@ def url_for(self, *args, **kwargs):
         raise RuntimeError(".url_for() is not supported "
                            "by sub-application root")
 
-    def url(self, **kwargs):
-        """Construct url for route with additional params."""
-        raise RuntimeError(".url() is not supported "
-                           "by sub-application root")
-
     def get_info(self):
         return {'app': self._app,
                 'prefix': self._prefix}
@@ -681,11 +640,6 @@ def url_for(self, *args, **kwargs):
         """Construct url for route with additional params."""
         return self._resource.url_for(*args, **kwargs)
 
-    def url(self, **kwargs):
-        """Construct url for route with additional params."""
-        super().url(**kwargs)
-        return self._resource.url(**kwargs)
-
     def get_info(self):
         return self._resource.get_info()
 
@@ -699,9 +653,6 @@ def __init__(self, http_exception):
     def url_for(self, *args, **kwargs):
         raise RuntimeError(".url_for() is not allowed for SystemRoute")
 
-    def url(self, *args, **kwargs):
-        raise RuntimeError(".url() is not allowed for SystemRoute")
-
     @property
     def name(self):
         return None
diff --git a/docs/web_reference.rst b/docs/web_reference.rst
index 76714e9f3df..0c97ab532fd 100644
--- a/docs/web_reference.rst
+++ b/docs/web_reference.rst
@@ -1793,19 +1793,6 @@ Resource classes hierarchy::
 
       :return: :class:`~yarl.URL` -- resulting URL instance.
 
-   .. method:: url(**kwargs)
-
-      Construct an URL for route with additional params.
-
-      **kwargs** depends on a list accepted by inherited resource
-      class parameters.
-
-      :return: :class:`str` -- resulting URL string.
-
-      .. deprecated:: 1.1
-
-         Use :meth:`url_for` instead.
-
 
 .. class:: Resource
 
diff --git a/tests/test_urldispatch.py b/tests/test_urldispatch.py
index b49925cf656..bcef56a5947 100644
--- a/tests/test_urldispatch.py
+++ b/tests/test_urldispatch.py
@@ -322,40 +322,19 @@ def test_route_dynamic(router):
     route = router.add_route('GET', '/get/{name}', handler,
                              name='name')
 
-    route2 = next(iter(router['name']))
-    with pytest.warns(DeprecationWarning):
-        url = route2.url(parts={'name': 'John'})
-    assert '/get/John' == url
-    assert route is route2
-
-
-def test_route_dynamic2(router):
-    handler = make_handler()
-    route = router.add_route('GET', '/get/{name}', handler,
-                             name='name')
-
     route2 = next(iter(router['name']))
     url = route2.url_for(name='John')
     assert '/get/John' == str(url)
     assert route is route2
 
 
-def test_route_with_qs(router):
-    handler = make_handler()
-    router.add_route('GET', '/get', handler, name='name')
-
-    with pytest.warns(DeprecationWarning):
-        url = router['name'].url(query=[('a', 'b'), ('c', '1')])
-    assert '/get?a=b&c=1' == url
-
-
 def test_add_static(router):
     resource = router.add_static('/st',
                                  os.path.dirname(aiohttp.__file__),
                                  name='static')
     assert router['static'] is resource
-    url = resource.url(filename='/dir/a.txt')
-    assert '/st/dir/a.txt' == url
+    url = resource.url_for(filename='/dir/a.txt')
+    assert '/st/dir/a.txt' == str(url)
     assert len(resource) == 2
 
 
@@ -363,10 +342,11 @@ def test_add_static_append_version(router):
     resource = router.add_static('/st',
                                  os.path.dirname(__file__),
                                  name='static')
-    url = resource.url(filename='/data.unknown_mime_type', append_version=True)
+    url = resource.url_for(filename='/data.unknown_mime_type',
+                           append_version=True)
     expect_url = '/st/data.unknown_mime_type?' \
                  'v=aUsn8CHEhhszc81d28QmlcBW0KQpfS2F4trgQKhOYd8%3D'
-    assert expect_url == url
+    assert expect_url == str(url)
 
 
 def test_add_static_append_version_set_from_constructor(router):
@@ -374,10 +354,10 @@ def test_add_static_append_version_set_from_constructor(router):
                                  os.path.dirname(__file__),
                                  append_version=True,
                                  name='static')
-    url = resource.url(filename='/data.unknown_mime_type')
+    url = resource.url_for(filename='/data.unknown_mime_type')
     expect_url = '/st/data.unknown_mime_type?' \
                  'v=aUsn8CHEhhszc81d28QmlcBW0KQpfS2F4trgQKhOYd8%3D'
-    assert expect_url == url
+    assert expect_url == str(url)
 
 
 def test_add_static_append_version_override_constructor(router):
@@ -385,36 +365,37 @@ def test_add_static_append_version_override_constructor(router):
                                  os.path.dirname(__file__),
                                  append_version=True,
                                  name='static')
-    url = resource.url(filename='/data.unknown_mime_type',
-                       append_version=False)
+    url = resource.url_for(filename='/data.unknown_mime_type',
+                           append_version=False)
     expect_url = '/st/data.unknown_mime_type'
-    assert expect_url == url
+    assert expect_url == str(url)
 
 
 def test_add_static_append_version_filename_without_slash(router):
     resource = router.add_static('/st',
                                  os.path.dirname(__file__),
                                  name='static')
-    url = resource.url(filename='data.unknown_mime_type', append_version=True)
+    url = resource.url_for(filename='data.unknown_mime_type',
+                           append_version=True)
     expect_url = '/st/data.unknown_mime_type?' \
                  'v=aUsn8CHEhhszc81d28QmlcBW0KQpfS2F4trgQKhOYd8%3D'
-    assert expect_url == url
+    assert expect_url == str(url)
 
 
 def test_add_static_append_version_non_exists_file(router):
     resource = router.add_static('/st',
                                  os.path.dirname(__file__),
                                  name='static')
-    url = resource.url(filename='/non_exists_file', append_version=True)
-    assert '/st/non_exists_file' == url
+    url = resource.url_for(filename='/non_exists_file', append_version=True)
+    assert '/st/non_exists_file' == str(url)
 
 
 def test_add_static_append_version_non_exists_file_without_slash(router):
     resource = router.add_static('/st',
                                  os.path.dirname(__file__),
                                  name='static')
-    url = resource.url(filename='non_exists_file', append_version=True)
-    assert '/st/non_exists_file' == url
+    url = resource.url_for(filename='non_exists_file', append_version=True)
+    assert '/st/non_exists_file' == str(url)
 
 
 def test_add_static_append_version_follow_symlink(router, tmpdir):
@@ -430,12 +411,12 @@ def test_add_static_append_version_follow_symlink(router, tmpdir):
     resource = router.add_static('/st', tmp_dir_path, follow_symlinks=True,
                                  append_version=True)
 
-    url = resource.url(
+    url = resource.url_for(
         filename='/append_version_symlink/data.unknown_mime_type')
 
     expect_url = '/st/append_version_symlink/data.unknown_mime_type?' \
                  'v=aUsn8CHEhhszc81d28QmlcBW0KQpfS2F4trgQKhOYd8%3D'
-    assert expect_url == url
+    assert expect_url == str(url)
 
 
 def test_add_static_append_version_not_follow_symlink(router, tmpdir):
@@ -452,30 +433,8 @@ def test_add_static_append_version_not_follow_symlink(router, tmpdir):
                                  append_version=True)
 
     filename = '/append_version_symlink/data.unknown_mime_type'
-    url = resource.url(filename=filename)
-    assert '/st/append_version_symlink/data.unknown_mime_type' == url
-
-
-def test_add_static_append_version_with_query(router):
-    resource = router.add_static('/st',
-                                 os.path.dirname(__file__),
-                                 name='static')
-    url = resource.url(filename='/data.unknown_mime_type',
-                       append_version=True,
-                       query={'key': 'val'})
-    expect_url = '/st/data.unknown_mime_type?' \
-                 'v=aUsn8CHEhhszc81d28QmlcBW0KQpfS2F4trgQKhOYd8%3D&key=val'
-    assert expect_url == url
-
-
-def test_add_static_append_version_non_exists_file_with_query(router):
-    resource = router.add_static('/st',
-                                 os.path.dirname(__file__),
-                                 name='static')
-    url = resource.url(filename='/non_exists_file',
-                       append_version=True,
-                       query={'key': 'val'})
-    assert '/st/non_exists_file?key=val' == url
+    url = resource.url_for(filename=filename)
+    assert '/st/append_version_symlink/data.unknown_mime_type' == str(url)
 
 
 def test_plain_not_match(router):
@@ -1021,13 +980,6 @@ def test_subapp_get_info(app, loop):
     assert resource.get_info() == {'prefix': '/pre', 'app': subapp}
 
 
-def test_subapp_url(app, loop):
-    subapp = web.Application()
-    resource = app.add_subapp('/pre', subapp)
-    with pytest.raises(RuntimeError):
-        resource.url()
-
-
 def test_subapp_url_for(app, loop):
     subapp = web.Application()
     resource = app.add_subapp('/pre', subapp)
diff --git a/tests/test_web_urldispatcher.py b/tests/test_web_urldispatcher.py
index 613d768c00e..44c7cc11844 100644
--- a/tests/test_web_urldispatcher.py
+++ b/tests/test_web_urldispatcher.py
@@ -288,8 +288,6 @@ async def handler(data, request):
 
 def test_system_route():
     route = SystemRoute(web.HTTPCreated(reason='test'))
-    with pytest.raises(RuntimeError):
-        route.url()
     with pytest.raises(RuntimeError):
         route.url_for()
     assert route.name is None

From 09ecefa8167d9762a94bd5a3e5053741344ddff4 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 10 Nov 2017 10:02:41 +0200
Subject: [PATCH 2/2] Add changelog

---
 CHANGES/2501.removal | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 CHANGES/2501.removal

diff --git a/CHANGES/2501.removal b/CHANGES/2501.removal
new file mode 100644
index 00000000000..1039b8a0e0b
--- /dev/null
+++ b/CHANGES/2501.removal
@@ -0,0 +1 @@
+Drop deprecated `resource.url()`.