Changeset 8215 for django/branches/gis/django/http/multipartparser.py

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/http/multipartparser.py (modified) (6 diffs)

django/branches/gis/django/http/multipartparser.py

@@ -5 +5 @@
-file upload handlers for processing.
-"""
+
-import cgi
-from django.conf import settings
@@ -13 +14 @@
-from django.core.files.uploadhandler import StopUpload, SkipFile, StopFutureHandlers
-
-'MultiPartParserError',
+ 'MultiPartParserError', 
-
-class MultiPartParserError(Exception):
@@ -163 +164 @@
-                elif item_type == FILE:
-                    # This is a file, use the handler...
-                    file_successful = True
-                    file_name = disposition.get('filename')
-                    if not file_name:
@@ -210 +210 @@
-
-                    except SkipFile, e:
-                        file_successful = False
-                        # Just use up the rest of this file...
-                        exhaust(field_stream)
@@ -516 +515 @@
-            end = index
-            next = index + len(self._boundary)
-            data_len = len(data) - 1
-            # backup over CRLF
-            if data[max(0,end-1)] == '\n':
@@ -522 +520 @@
-            if data[max(0,end-1)] == '\r':
-                end -= 1
-            # skip over --CRLF
-            #if data[min(data_len,next)] == '-':
-            #    next += 1
-            #if data[min(data_len,next)] == '-':
-            #    next += 1
-            #if data[min(data_len,next)] == '\r':
-            #    next += 1
-            #if data[min(data_len,next)] == '\n':
-            #    next += 1
-            return end, next
-