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

3 files changed, 2 insertions, 16 deletions

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index f06855611a..9639ff4956 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1213,7 +1213,6 @@ class Query(object):
                 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
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index fa1ae11968..2049289a0b 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -4,6 +4,7 @@ Multi-part parsing for file uploads.
 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.encoding import force_unicode
 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 @@ class MultiPartParser(object):
                                           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 @@ class MultiPartParser(object):
                                     break
 
                     except SkipFile, e:
-                        file_successful = False
                         # Just use up the rest of this file...
                         exhaust(field_stream)
                     else:
@@ -515,21 +514,11 @@ class BoundaryIter(object):
         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):
diff --git a/django/views/debug.py b/django/views/debug.py
index 380aa8bf06..adc1ae936e 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -145,8 +145,6 @@ class ExceptionReporter:
             '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):
         """