Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #7848 -- Removed a bunch of code that wasn't contributing to so…

…ciety. Thanks, julien

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0894ddb2bbb706ca8b9918df42dfd8a3fa4dbc69 1 parent 29f0e81
Adrian Holovaty adrianholovaty authored
1  django/db/models/sql/query.py
View
@@ -1213,7 +1213,6 @@ def setup_joins(self, names, opts, alias, dupe_multis, allow_many=True,
raise MultiJoin(pos + 1)
if model:
# The field lives on a base class of the current model.
- alias_list = []
for int_model in opts.get_base_chain(model):
lhs_col = opts.parents[int_model].column
dedupe = lhs_col in opts.duplicate_targets
15 django/http/multipartparser.py
View
@@ -4,6 +4,7 @@
Exposes one class, ``MultiPartParser``, which feeds chunks of uploaded data to
file upload handlers for processing.
"""
+
import cgi
from django.conf import settings
from django.core.exceptions import SuspiciousOperation
@@ -12,7 +13,7 @@
from django.utils.text import unescape_entities
from django.core.files.uploadhandler import StopUpload, SkipFile, StopFutureHandlers
-__all__ = ('MultiPartParser','MultiPartParserError','InputStreamExhausted')
+__all__ = ('MultiPartParser', 'MultiPartParserError', 'InputStreamExhausted')
class MultiPartParserError(Exception):
pass
@@ -162,7 +163,6 @@ def parse(self):
force_unicode(data, encoding, errors='replace'))
elif item_type == FILE:
# This is a file, use the handler...
- file_successful = True
file_name = disposition.get('filename')
if not file_name:
continue
@@ -209,7 +209,6 @@ def parse(self):
break
except SkipFile, e:
- file_successful = False
# Just use up the rest of this file...
exhaust(field_stream)
else:
@@ -515,21 +514,11 @@ def _find_boundary(self, data, eof = False):
else:
end = index
next = index + len(self._boundary)
- data_len = len(data) - 1
# backup over CRLF
if data[max(0,end-1)] == '\n':
end -= 1
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
def exhaust(stream_or_iterable):
2  django/views/debug.py
View
@@ -145,8 +145,6 @@ def get_template_exception_info(self):
'line': line,
'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):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.