Request.current_route_url() now returns the query string by default.

2 files changed, 30 insertions, 0 deletions

diff --git a/pyramid/tests/test_url.py b/pyramid/tests/test_url.py
index e33eeebfd..2830f8f10 100644
--- a/pyramid/tests/test_url.py
+++ b/pyramid/tests/test_url.py
@@ -485,6 +485,34 @@ class TestURLMethodsMixin(unittest.TestCase):
         self.assertEqual(result,
                          'http://example.com:5432/1/2/3/extra1/extra2?a=1#foo')
 
+    def test_current_route_url_with_request_query(self):
+        from pyramid.interfaces import IRoutesMapper
+        from webob.multidict import GetDict
+        request = self._makeOne()
+        request.GET = GetDict([('q', '123')], {})
+        route = DummyRoute('/1/2/3')
+        mapper = DummyRoutesMapper(route=route)
+        request.matched_route = route
+        request.matchdict = {}
+        request.registry.registerUtility(mapper, IRoutesMapper)
+        result = request.current_route_url()
+        self.assertEqual(result,
+                         'http://example.com:5432/1/2/3?q=123')
+
+    def test_current_route_url_with_query_override(self):
+        from pyramid.interfaces import IRoutesMapper
+        from webob.multidict import GetDict
+        request = self._makeOne()
+        request.GET = GetDict([('q', '123')], {})
+        route = DummyRoute('/1/2/3')
+        mapper = DummyRoutesMapper(route=route)
+        request.matched_route = route
+        request.matchdict = {}
+        request.registry.registerUtility(mapper, IRoutesMapper)
+        result = request.current_route_url(_query={'a':1})
+        self.assertEqual(result,
+                         'http://example.com:5432/1/2/3?a=1')
+
     def test_current_route_path(self):
         from pyramid.interfaces import IRoutesMapper
         request = self._makeOne()
diff --git a/pyramid/url.py b/pyramid/url.py
index 83f0d1eab..feb304fb8 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -221,6 +221,8 @@ class URLMethodsMixin(object):
             query = kw.pop('_query')
             if query:
                 qs = '?' + urlencode(query, doseq=True)
+        elif getattr(self, 'GET', None):
+            qs = '?' + urlencode(self.GET, doseq=True)
 
         if '_anchor' in kw:
             anchor = kw.pop('_anchor')