Ticket #7848: dead.code.diff

django/django/http/multipartparser.py

@@ -162 +162 @@
-                                          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 +208 @@
-                                    break
-
-                    except SkipFile, e:
-                        file_successful = False
-                        # Just use up the rest of this file...
-                        exhaust(field_stream)
-                    else:
@@ -515 +513 @@
-        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):

django/django/db/models/sql/query.py

@@ -1214 +1214 @@
-                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

django/django/views/debug.py

@@ -145 +145 @@
-            '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):
-        """