Changeset 7577

Timestamp:

06/06/08 08:39:42 (6 months ago)

Author:

russellm

Message:

Fixed #7143 -- Modified the test client to better match (most) real browser behavior when uploading files. Now, only the file name is sent, rather than the full path. Thanks for the report, cpinto.

Files:

• django/trunk/django/test/client.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/test_client_regress/views.py (modified) (2 diffs)

django/trunk/django/test/client.py

@@ -1 +1 @@
-import urllib
-import sys
+import os
-from cStringIO import StringIO
-from django.conf import settings
@@ -68 +69 @@
-            lines.extend([
-                '--' + boundary,
-value.name
+os.path.basename(value.name)
-                'Content-Type: application/octet-stream',
-                '',

django/trunk/tests/regressiontests/test_client_regress/views.py

@@ +1 @@
+import os
+
-from django.contrib.auth.decorators import login_required
-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError
@@ -14 +16 @@
-    form_data.update(request.FILES)
-    if isinstance(form_data['file_field'], dict) and isinstance(form_data['name'], unicode):
+        # If a file is posted, the dummy client should only post the file name,
+        # not the full path.
+        if os.path.dirname(form_data['file_field']['filename']) != '':
+            return HttpResponseServerError()            
-        return HttpResponse('')
-    else: