innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #7848 -- Removed a bunch of code that wasn't contributing to society. Thanks, julien 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2008-07-22 03:26:25 +00:00
parent 29f0e8182f
commit 0894ddb2bb
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/models/sql/query.py
View File

@ -1213,7 +1213,6 @@ class Query(object):
raise MultiJoin(pos + 1) raise MultiJoin(pos + 1)
if model: if model:
# The field lives on a base class of the current model. # The field lives on a base class of the current model.
alias_list = []
for int_model in opts.get_base_chain(model): for int_model in opts.get_base_chain(model):
lhs_col = opts.parents[int_model].column lhs_col = opts.parents[int_model].column
dedupe = lhs_col in opts.duplicate_targets dedupe = lhs_col in opts.duplicate_targets

15
django/http/multipartparser.py
View File

@ -4,6 +4,7 @@ Multi-part parsing for file uploads.
Exposes one class, ``MultiPartParser``, which feeds chunks of uploaded data to Exposes one class, ``MultiPartParser``, which feeds chunks of uploaded data to
file upload handlers for processing. file upload handlers for processing.
""" """
import cgi import cgi
from django.conf import settings from django.conf import settings
from django.core.exceptions import SuspiciousOperation from django.core.exceptions import SuspiciousOperation
@ -12,7 +13,7 @@ from django.utils.encoding import force_unicode
from django.utils.text import unescape_entities from django.utils.text import unescape_entities
from django.core.files.uploadhandler import StopUpload, SkipFile, StopFutureHandlers from django.core.files.uploadhandler import StopUpload, SkipFile, StopFutureHandlers
__all__ = ('MultiPartParser','MultiPartParserError','InputStreamExhausted') __all__ = ('MultiPartParser', 'MultiPartParserError', 'InputStreamExhausted')
class MultiPartParserError(Exception): class MultiPartParserError(Exception):
pass pass
@ -162,7 +163,6 @@ class MultiPartParser(object):
force_unicode(data, encoding, errors='replace')) force_unicode(data, encoding, errors='replace'))
elif item_type == FILE: elif item_type == FILE:
# This is a file, use the handler... # This is a file, use the handler...
file_successful = True
file_name = disposition.get('filename') file_name = disposition.get('filename')
if not file_name: if not file_name:
continue continue
@ -209,7 +209,6 @@ class MultiPartParser(object):
break break
except SkipFile, e: except SkipFile, e:
file_successful = False
# Just use up the rest of this file... # Just use up the rest of this file...
exhaust(field_stream) exhaust(field_stream)
else: else:
@ -515,21 +514,11 @@ class BoundaryIter(object):
else: else:
end = index end = index
next = index + len(self._boundary) next = index + len(self._boundary)
data_len = len(data) - 1
# backup over CRLF # backup over CRLF
if data[max(0,end-1)] == '\n': if data[max(0,end-1)] == '\n':
end -= 1 end -= 1
if data[max(0,end-1)] == '\r': if data[max(0,end-1)] == '\r':
end -= 1 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 return end, next
def exhaust(stream_or_iterable): def exhaust(stream_or_iterable):

2
django/views/debug.py
View File

@ -145,8 +145,6 @@ class ExceptionReporter:
'line': line, 'line': line,
'name': origin.name, 'name': origin.name,
} }
if hasattr(self.exc_value, 'exc_info') and self.exc_value.exc_info:
exc_type, exc_value, tb = self.exc_value.exc_info
def _get_lines_from_file(self, filename, lineno, context_lines, loader=None, module_name=None): def _get_lines_from_file(self, filename, lineno, context_lines, loader=None, module_name=None):
""" """