Changeset 8215 for django/branches/gis/django/core/files

Timestamp:

08/05/08 12:15:33 (5 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/core/files/temp.py (copied) (copied from django/trunk/django/core/files/temp.py)
• django/branches/gis/django/core/files/uploadedfile.py (modified) (2 diffs)
• django/branches/gis/django/core/files/uploadhandler.py (modified) (1 diff)

django/branches/gis/django/core/files/uploadedfile.py

@@ -4 +4 @@
-
-import os
-import tempfile
-import warnings
-try:
@@ -12 +11 @@
-
-from django.conf import settings
+
+from django.core.files import temp as tempfile
-
-__all__ = ('UploadedFile', 'TemporaryUploadedFile', 'InMemoryUploadedFile', 'SimpleUploadedFile')

django/branches/gis/django/core/files/uploadhandler.py

@@ -2 +2 @@
-Base file upload handler classes, and the built-in concrete subclasses
-"""
-
-
+
-try:
-    from cStringIO import StringIO