Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored July 22, 2008
1  django/db/models/sql/query.py
@@ -1213,7 +1213,6 @@ def setup_joins(self, names, opts, alias, dupe_multis, allow_many=True,
1213 1213
                 raise MultiJoin(pos + 1)
1214 1214
             if model:
1215 1215
                 # The field lives on a base class of the current model.
1216  
-                alias_list = []
1217 1216
                 for int_model in opts.get_base_chain(model):
1218 1217
                     lhs_col = opts.parents[int_model].column
1219 1218
                     dedupe = lhs_col in opts.duplicate_targets
15  django/http/multipartparser.py
@@ -4,6 +4,7 @@
4 4
 Exposes one class, ``MultiPartParser``, which feeds chunks of uploaded data to
5 5
 file upload handlers for processing.
6 6
 """
  7
+
7 8
 import cgi
8 9
 from django.conf import settings
9 10
 from django.core.exceptions import SuspiciousOperation
@@ -12,7 +13,7 @@
12 13
 from django.utils.text import unescape_entities
13 14
 from django.core.files.uploadhandler import StopUpload, SkipFile, StopFutureHandlers
14 15
 
15  
-__all__ = ('MultiPartParser','MultiPartParserError','InputStreamExhausted')
  16
+__all__ = ('MultiPartParser', 'MultiPartParserError', 'InputStreamExhausted')
16 17
 
17 18
 class MultiPartParserError(Exception):
18 19
     pass
@@ -162,7 +163,6 @@ def parse(self):
162 163
                                           force_unicode(data, encoding, errors='replace'))
163 164
                 elif item_type == FILE:
164 165
                     # This is a file, use the handler...
165  
-                    file_successful = True
166 166
                     file_name = disposition.get('filename')
167 167
                     if not file_name:
168 168
                         continue
@@ -209,7 +209,6 @@ def parse(self):
209 209
                                     break
210 210
 
211 211
                     except SkipFile, e:
212  
-                        file_successful = False
213 212
                         # Just use up the rest of this file...
214 213
                         exhaust(field_stream)
215 214
                     else:
@@ -515,21 +514,11 @@ def _find_boundary(self, data, eof = False):
515 514
         else:
516 515
             end = index
517 516
             next = index + len(self._boundary)
518  
-            data_len = len(data) - 1
519 517
             # backup over CRLF
520 518
             if data[max(0,end-1)] == '\n':
521 519
                 end -= 1
522 520
             if data[max(0,end-1)] == '\r':
523 521
                 end -= 1
524  
-            # skip over --CRLF
525  
-            #if data[min(data_len,next)] == '-':
526  
-            #    next += 1
527  
-            #if data[min(data_len,next)] == '-':
528  
-            #    next += 1
529  
-            #if data[min(data_len,next)] == '\r':
530  
-            #    next += 1
531  
-            #if data[min(data_len,next)] == '\n':
532  
-            #    next += 1
533 522
             return end, next
534 523
 
535 524
 def exhaust(stream_or_iterable):
2  django/views/debug.py
@@ -145,8 +145,6 @@ def get_template_exception_info(self):
145 145
             'line': line,
146 146
             'name': origin.name,
147 147
         }
148  
-        if hasattr(self.exc_value, 'exc_info') and self.exc_value.exc_info:
149  
-            exc_type, exc_value, tb = self.exc_value.exc_info
150 148
 
151 149
     def _get_lines_from_file(self, filename, lineno, context_lines, loader=None, module_name=None):
152 150
         """

0 notes on commit 0894ddb

Please sign in to comment.
Something went wrong with that request. Please try again.