Ticket #13721: content_type_extra.diff

django/core/files/uploadhandler.py

@@ -84 +84 @@
         """
         pass
 
-    def new_file(self, field_name, file_name, content_type, content_length, charset=None):
+    def new_file(self, field_name, file_name, content_type, content_length,
+            charset=None, content_type_extra=None):
         """
         Signal that a new file has been started.
 
@@ -96 +97 @@
         self.content_type = content_type
         self.content_length = content_length
         self.charset = charset
+        if content_type_extra is None:
+            content_type_extra = {}
+        self.content_type_extra = content_type_extra
 
     def receive_data_chunk(self, raw_data, start):
         """

django/http/multipartparser.py

@@ -169 +169 @@
                     file_name = self.IE_sanitize(unescape_entities(file_name))
 
                     content_type = meta_data.get('content-type', ('',))[0].strip()
+                    content_type_extra = meta_data.get('content-type', (0,{}))[1]
+                    if content_type_extra is None:
+                        content_type_extra = {}
                     try:
-                        charset = meta_data.get('content-type', (0,{}))[1].get('charset', None)
+                        charset = content_type_extra.get('charset', None)
                     except:
                         charset = None
 
@@ -185 +188 @@
                             try:
                                 handler.new_file(field_name, file_name,
                                                  content_type, content_length,
-                                                 charset)
+                                                 charset, content_type_extra.copy())
                             except StopFutureHandlers:
                                 break
 

django/test/client.py

@@ -142 +142 @@
 
 def encode_file(boundary, key, file):
     to_str = lambda s: smart_str(s, settings.DEFAULT_CHARSET)
-    content_type = mimetypes.guess_type(file.name)[0]
+    if hasattr(file, 'content_type'):
+        content_type = file.content_type
+    else:
+        content_type = mimetypes.guess_type(file.name)[0]
     if content_type is None:
         content_type = 'application/octet-stream'
     return [

docs/topics/http/file-uploads.txt

@@ -195 +195 @@
         For ``text/*`` content-types, the character set (i.e. ``utf8``) supplied
         by the browser. Again, "trust but verify" is the best policy here.
 
+    ``UploadedFile.content_type_extra``
+        A dict containing the extra parameters that were passed to the
+        content-type header.
+
     ``UploadedFile.temporary_file_path()``
         Only files uploaded onto disk will have this method; it returns the full
         path to the temporary uploaded file.
@@ -351 +355 @@
 
         The default is 64*2\ :sup:`10` bytes, or 64 KB.
 
-    ``FileUploadHandler.new_file(self, field_name, file_name, content_type, content_length, charset)``
+    ``FileUploadHandler.new_file(self, field_name, file_name, content_type, content_length, charset, content_type_extra)``
         Callback signaling that a new file upload is starting. This is called
         before any data has been fed to any upload handlers.
 
@@ -369 +373 @@
         ``charset`` is the character set (i.e. ``utf8``) given by the browser.
         Like ``content_length``, this sometimes won't be provided.
 
+        ``content_type_extra`` is a dict containing the extra parameters that
+        were passed to the content-type header.
+
         This method may raise a ``StopFutureHandlers`` exception to prevent
         future handlers from handling this file.
 

tests/regressiontests/file_uploads/tests.py

@@ -170 +170 @@
         got = simplejson.loads(response.content)
         self.assert_('f' not in got)
 
+    def test_extra_content_type(self):
+        f = tempfile.NamedTemporaryFile()
+        f.write('a' * (2 ** 21))
+        f.seek(0)
+        f.content_type = 'text/plain; blob-key=upload blob key; other=test'
+
+        response = self.client.post("/file_uploads/content_type_extra/", {'f': f})
+        got = simplejson.loads(response.content)
+        self.assertEqual(got['f'], 'upload blob key')
+
     def test_broken_custom_upload_handler(self):
         f = tempfile.NamedTemporaryFile()
         f.write('a' * (2 ** 21))

tests/regressiontests/file_uploads/uploadhandler.py

@@ -2 +2 @@
 Upload handlers to test the upload API.
 """
 
-from django.core.files.uploadhandler import FileUploadHandler, StopUpload
+from django.core.files.uploadedfile import InMemoryUploadedFile
+from django.core.files.uploadhandler import (FileUploadHandler, StopUpload,
+    StopFutureHandlers)
+from StringIO import StringIO
 
 class QuotaUploadHandler(FileUploadHandler):
     """
@@ -32 +35 @@
     """A handler that raises an exception."""
     def receive_data_chunk(self, raw_data, start):
         raise CustomUploadError("Oops!")
+
+class ContentTypeExtraUploadHandler(FileUploadHandler):
+    """
+    File upload handler that handles content_type_extra
+    """
+
+    def new_file(self, *args, **kwargs):
+        super(ContentTypeExtraUploadHandler, self).new_file(*args, **kwargs)
+        self.blobkey = self.content_type_extra.get('blob-key', '')
+        self.file = StringIO()
+        self.file.write(self.blobkey)
+        self.active = self.blobkey is not None
+        if self.active:
+            raise StopFutureHandlers()
+
+    def receive_data_chunk(self, raw_data, start):
+        """
+        Add the data to the StringIO file.
+        """
+        if not self.active:
+            return raw_data
+
+    def file_complete(self, file_size):
+        if not self.active:
+            return
+
+        self.file.seek(0)
+        return InMemoryUploadedFile(
+            file = self.file,
+            field_name = self.field_name,
+            name = self.file_name,
+            content_type = self.content_type,
+            size = file_size,
+            charset = self.charset
+        )

tests/regressiontests/file_uploads/urls.py

@@ -2 +2 @@
 import views
 
 urlpatterns = patterns('',
-    (r'^upload/$',          views.file_upload_view),
-    (r'^verify/$',          views.file_upload_view_verify),
-    (r'^unicode_name/$',    views.file_upload_unicode_name),
-    (r'^echo/$',            views.file_upload_echo),
-    (r'^quota/$',           views.file_upload_quota),
-    (r'^quota/broken/$',    views.file_upload_quota_broken),
-    (r'^getlist_count/$',   views.file_upload_getlist_count),
-    (r'^upload_errors/$',   views.file_upload_errors),
+    (r'^upload/$',              views.file_upload_view),
+    (r'^verify/$',              views.file_upload_view_verify),
+    (r'^unicode_name/$',        views.file_upload_unicode_name),
+    (r'^echo/$',                views.file_upload_echo),
+    (r'^quota/$',               views.file_upload_quota),
+    (r'^quota/broken/$',        views.file_upload_quota_broken),
+    (r'^getlist_count/$',       views.file_upload_getlist_count),
+    (r'^upload_errors/$',       views.file_upload_errors),
+    (r'^content_type_extra/$',  views.file_upload_content_type_extra),
 )

tests/regressiontests/file_uploads/views.py

@@ -3 +3 @@
 from django.http import HttpResponse, HttpResponseServerError
 from django.utils import simplejson
 from models import FileModel, UPLOAD_TO
-from uploadhandler import QuotaUploadHandler, ErroringUploadHandler
+from uploadhandler import (QuotaUploadHandler, ErroringUploadHandler,
+    ContentTypeExtraUploadHandler)
 from django.utils.hashcompat import sha_constructor
 from tests import UNICODE_FILENAME
 
@@ -112 +113 @@
 def file_upload_errors(request):
     request.upload_handlers.insert(0, ErroringUploadHandler())
     return file_upload_echo(request)
+
+def file_upload_content_type_extra(request):
+    request.upload_handlers.insert(0, ContentTypeExtraUploadHandler())
+    r = dict([(k, f.read()) for k, f in request.FILES.items()])
+    return HttpResponse(simplejson.dumps(r))