Changeset 7814 for django/trunk/django/db/models/base.py

Timestamp:

07/01/08 10:10:51 (4 months ago)

Author:

jacob

Message:

Fixed #2070: refactored Django's file upload capabilities.

A description of the new features can be found in the new upload handling documentation; the executive summary is that Django will now happily handle uploads of large files without issues.

This changes the representation of uploaded files from dictionaries to bona fide objects; see BackwardsIncompatibleChanges for details.

Files:

• django/trunk/django/db/models/base.py (modified) (4 diffs)

django/trunk/django/db/models/base.py

@@ -20 +20 @@
-from django.utils.functional import curry
-from django.utils.encoding import smart_str, force_unicode, smart_unicode
+from django.core.files.move import file_move_safe
+from django.core.files import locks
-from django.conf import settings
-
@@ -470 +472 @@
-        return os.path.getsize(self._get_FIELD_filename(field))
-
-contents
+field
-        directory = field.get_directory_name()
-        try: # Create the date-based directory if it doesn't exist.
@@ -476 +478 @@
-        except OSError: # Directory probably already exists.
-            pass
+
+        #
+        # Check for old-style usage (files-as-dictionaries). Warn here first
+        # since there are multiple locations where we need to support both new
+        # and old usage.
+        #
+        if isinstance(raw_field, dict):
+            import warnings
+            warnings.warn(
+                message = "Representing uploaded files as dictionaries is"\
+                          " deprected. Use django.core.files.SimpleUploadedFile"\
+                          " instead.",
+                category = DeprecationWarning,
+                stacklevel = 2
+            )
+            from django.core.files.uploadedfile import SimpleUploadedFile
+            raw_field = SimpleUploadedFile.from_dict(raw_field)
+
+        elif isinstance(raw_field, basestring):
+            import warnings
+            warnings.warn(
+                message = "Representing uploaded files as strings is "\
+                          " deprecated. Use django.core.files.SimpleUploadedFile "\
+                          " instead.",
+                category = DeprecationWarning,
+                stacklevel = 2
+            )
+            from django.core.files.uploadedfile import SimpleUploadedFile
+            raw_field = SimpleUploadedFile(filename, raw_field)
+
+        if filename is None:
+            filename = raw_field.file_name
+
-        filename = field.get_filename(filename)
-
+        #
-        # If the filename already exists, keep adding an underscore to the name of
-        # the file until the filename doesn't exist.
+        #
-        while os.path.exists(os.path.join(settings.MEDIA_ROOT, filename)):
-            try:
@@ -487 +524 @@
-            else:
-                filename = filename[:dot_index] + '_' + filename[dot_index:]
-
-
+
+
+
+
-        setattr(self, field.attname, filename)
-
-        full_filename = self._get_FIELD_filename(field)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Save the width and/or height, if applicable.