Index: tests/regressiontests/test_client_regress/views.py
===================================================================
--- tests/regressiontests/test_client_regress/views.py	(revision 7022)
+++ tests/regressiontests/test_client_regress/views.py	(working copy)
@@ -24,6 +24,18 @@
     return HttpResponse("Hello world")
 get_view = login_required(get_view)
 
+def view_with_argument(request, name):
+    """A view that takes a string argument
+    
+    The purpose of this view is to check that if a space is provided in
+    the argument, the test framework unescapes the %20 before passing 
+    the value to the view.
+    """
+    if name == 'Arthur Dent':
+	    return HttpResponse('Hi, Arthur')
+    else:
+	    return HttpResponse('Howdy, %s' % name)
+		
 def login_protected_redirect_view(request):
     "A view that redirects all requests to the GET view"
     return HttpResponseRedirect('/test_client_regress/get_view/')
Index: tests/regressiontests/test_client_regress/models.py
===================================================================
--- tests/regressiontests/test_client_regress/models.py	(revision 7022)
+++ tests/regressiontests/test_client_regress/models.py	(working copy)
@@ -4,6 +4,7 @@
 """
 from django.test import Client, TestCase
 from django.core import mail
+from django.core.urlresolvers import reverse
 import os
 
 class AssertContainsTests(TestCase):
@@ -261,3 +262,18 @@
         # Check that assertRedirects uses the original client, not the
         # default client.
         self.assertRedirects(response, "http://testserver/test_client_regress/get_view/")
+
+
+class URLEscapingTests(TestCase):
+    def test_simple_argument(self):
+        "Get a view that has a simple string argument"
+        response = self.client.get(reverse('arg_view', args=['Slartibartfast']))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Howdy, Slartibartfast')
+
+    def test_argument_with_space(self):
+        "Get a view that has a string argument that requires escaping"
+        response = self.client.get(reverse('arg_view', args=['Arthur Dent']))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Hi, Arthur')
+        
\ No newline at end of file
Index: tests/regressiontests/test_client_regress/urls.py
===================================================================
--- tests/regressiontests/test_client_regress/urls.py	(revision 7022)
+++ tests/regressiontests/test_client_regress/urls.py	(working copy)
@@ -5,5 +5,6 @@
     (r'^no_template_view/$', views.no_template_view),
     (r'^file_upload/$', views.file_upload_view),
     (r'^get_view/$', views.get_view),
+    url(r'^arg_view/(?P<name>.+)/$', views.view_with_argument, name='arg_view'),
     (r'^login_protected_redirect_view/$', views.login_protected_redirect_view)
 )
