Ticket #18003: 18003.diff

django/http/multipartparser.py

@@ -6 +6 @@
 """
 
 import cgi
+import sys
 from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
 from django.utils.datastructures import MultiValueDict
@@ -198 +199 @@
                                     chunk = str(chunk).decode('base64')
                                 except Exception, e:
                                     # Since this is only a chunk, any error is an unfixable error.
-                                    raise MultiPartParserError("Could not decode base64 data: %r" % e)
+                                    msg = "Could not decode base64 data: %r" % e
+                                    raise MultiPartParserError, MultiPartParserError(msg), sys.exc_info()[2]
 
                             for i, handler in enumerate(handlers):
                                 chunk_length = len(chunk)

django/test/testcases.py

@@ -1116 +1116 @@
                     for port in range(extremes[0], extremes[1] + 1):
                         possible_ports.append(port)
         except Exception:
-            raise ImproperlyConfigured('Invalid address ("%s") for live '
-                'server.' % specified_address)
+            msg = 'Invalid address ("%s") for live server.' % specified_address
+            raise ImproperlyConfigured, ImproperlyConfigured(msg), sys.exc_info()[2]
         cls.server_thread = LiveServerThread(
             host, possible_ports, connections_override)
         cls.server_thread.daemon = True

django/forms/util.py

@@ +1 @@
+import sys
+
 from django.conf import settings
 from django.utils.html import conditional_escape
 from django.utils.encoding import StrAndUnicode, force_unicode
@@ -67 +69 @@
         try:
             return timezone.make_aware(value, current_timezone)
         except Exception, e:
-            raise ValidationError(_('%(datetime)s couldn\'t be interpreted '
-                                    'in time zone %(current_timezone)s; it '
-                                    'may be ambiguous or it may not exist.')
-                                  % {'datetime': value,
-                                     'current_timezone': current_timezone})
+            msg = _(
+                '%(datetime)s couldn\'t be interpreted '
+                'in time zone %(current_timezone)s; it '
+                'may be ambiguous or it may not exist.') % {'datetime': value, 'current_timezone': current_timezone}
+            raise ValidationError, ValidationError(msg), sys.exc_info()[2]
     return value
 
 def to_current_timezone(value):

django/forms/fields.py

@@ -8 +8 @@
 import datetime
 import os
 import re
+import sys
 import urlparse
 from decimal import Decimal, DecimalException
 try:
@@ -579 +580 @@
             # raised. Catch and re-raise.
             raise
         except Exception: # Python Imaging Library doesn't recognize it as an image
-            raise ValidationError(self.error_messages['invalid_image'])
+            raise ValidationError, ValidationError(self.error_messages['invalid_image']), sys.exc_info()[2]
         if hasattr(f, 'seek') and callable(f.seek):
             f.seek(0)
         return f

django/core/servers/basehttp.py

@@ -119 +119 @@
         try:
             super(WSGIServer, self).server_bind()
         except Exception, e:
-            raise WSGIServerException(e)
+            raise WSGIServerException, WSGIServerException(e), sys.exc_info()[2]
         self.setup_environ()
 
 

django/core/serializers/json.py

@@ -4 +4 @@
 
 import datetime
 import decimal
+import sys
 from StringIO import StringIO
 
 from django.core.serializers.base import DeserializationError
@@ -44 +45 @@
         raise
     except Exception, e:
         # Map to deserializer error
-        raise DeserializationError(e)
+        raise DeserializationError, DeserializationError(e), sys.exc_info()[2]
 
 
 class DjangoJSONEncoder(simplejson.JSONEncoder):

django/core/serializers/pyyaml.py

@@ -6 +6 @@
 
 from StringIO import StringIO
 import decimal
+import sys
 import yaml
 
 from django.db import models
@@ -59 +60 @@
         raise
     except Exception, e:
         # Map to deserializer error
-        raise DeserializationError(e)
+        raise DeserializationError, DeserializationError(e), sys.exc_info()[2]

django/core/management/commands/flush.py

@@ +1 @@
+import sys
+
 from optparse import make_option
 
 from django.conf import settings
@@ -57 +59 @@
                     cursor.execute(sql)
             except Exception, e:
                 transaction.rollback_unless_managed(using=db)
-                raise CommandError("""Database %s couldn't be flushed. Possible reasons:
-  * The database isn't running or isn't configured correctly.
-  * At least one of the expected database tables doesn't exist.
-  * The SQL was invalid.
-Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.
-The full error: %s""" % (connection.settings_dict['NAME'], e))
+                new_msg = (
+                    "Database %s couldn't be flushed. Possible reasons:\n"
+                    "  * The database isn't running or isn't configured correctly.\n"
+                    "  * At least one of the expected database tables doesn't exist.\n"
+                    "  * The SQL was invalid.\n"
+                    "Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.\n"
+                    "The full error: %s") % (connection.settings_dict['NAME'], e)
+                raise CommandError, CommandError(new_msg), sys.exc_info()[2]
             transaction.commit_unless_managed(using=db)
 
             # Emit the post sync signal. This allows individual

django/templatetags/i18n.py

@@ -1 +1 @@
 import re
+import sys
 
 from django.template import (Node, Variable, TemplateSyntaxError,
     TokenParser, Library, TOKEN_TEXT, TOKEN_VAR)
@@ -415 +416 @@
                 value = remaining_bits.pop(0)
                 value = parser.compile_filter(value)
             except Exception:
-                raise TemplateSyntaxError('"context" in %r tag expected '
-                                          'exactly one argument.' % bits[0])
+                msg = (
+                    '"context" in %r tag expected '
+                    'exactly one argument.') % bits[0]
+                raise TemplateSyntaxError, TemplateSyntaxError(msg), sys.exc_info()[2]
         else:
             raise TemplateSyntaxError('Unknown argument for %r tag: %r.' %
                                       (bits[0], option))

django/contrib/gis/db/backends/spatialite/base.py

@@ +1 @@
+import sys
 from ctypes.util import find_library
 from django.conf import settings
 
@@ -57 +58 @@
             try:
                 cur.execute("SELECT load_extension(%s)", (self.spatialite_lib,))
             except Exception, msg:
-                raise ImproperlyConfigured('Unable to load the SpatiaLite library extension '
-                                           '"%s" because: %s' % (self.spatialite_lib, msg))
+                new_msg = (
+                    'Unable to load the SpatiaLite library extension '
+                    '"%s" because: %s') % (self.spatialite_lib, msg)
+                raise ImproperlyConfigured, ImproperlyConfigured(new_msg), sys.exc_info()[2]
             return cur
         else:
             return self.connection.cursor(factory=SQLiteCursorWrapper)

django/contrib/gis/db/backends/spatialite/operations.py

@@ -1 +1 @@
 import re
+import sys
 from decimal import Decimal
 
 from django.contrib.gis.db.backends.base import BaseSpatialOperations
@@ -123 +124 @@
         except ImproperlyConfigured:
             raise
         except Exception, msg:
-            raise ImproperlyConfigured('Cannot determine the SpatiaLite version for the "%s" '
-                                       'database (error was "%s").  Was the SpatiaLite initialization '
-                                       'SQL loaded on this database?' %
-                                       (self.connection.settings_dict['NAME'], msg))
+            new_msg = (
+                'Cannot determine the SpatiaLite version for the "%s" '
+                'database (error was "%s").  Was the SpatiaLite initialization '
+                'SQL loaded on this database?') %
+                                       (self.connection.settings_dict['NAME'], msg)
+            raise ImproperlyConfigured, ImproperlyConfigured(new_msg), sys.exc_info()[2]
 
         # Creating the GIS terms dictionary.
         gis_terms = ['isnull']

django/contrib/gis/db/backends/oracle/introspection.py

@@ +1 @@
+import sys
 import cx_Oracle
 from django.db.backends.oracle.introspection import DatabaseIntrospection
 
@@ -17 +18 @@
                                (table_name.upper(), geo_col.upper()))
                 row = cursor.fetchone()
             except Exception, msg:
-                raise Exception('Could not find entry in USER_SDO_GEOM_METADATA corresponding to "%s"."%s"\n'
-                                'Error message: %s.' % (table_name, geo_col, msg))
+                new_msg = (
+                    'Could not find entry in USER_SDO_GEOM_METADATA '
+                    'corresponding to "%s"."%s"\n'
+                    'Error message: %s.') % (table_name, geo_col, msg)
+                raise Exception, Exception(new_msg), sys.exc_info()[2]
 
             # TODO: Research way to find a more specific geometry field type for
             # the column's contents.

django/contrib/gis/utils/layermapping.py

@@ -431 +431 @@
             # Creating the CoordTransform object
             return CoordTransform(self.source_srs, target_srs)
         except Exception, msg:
-            raise LayerMapError('Could not translate between the data source and model geometry: %s' % msg)
+            new_msg = 'Could not translate between the data source and model geometry: %s' % msg
+            raise LayerMapError, LayerMapError(new_msg), sys.exc_info()[2]
 
     def geometry_field(self):
         "Returns the GeometryField instance associated with the geographic column."

django/contrib/admin/views/main.py

@@ -1 +1 @@
 import operator
+import sys
 
 from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
 from django.core.paginator import InvalidPage
@@ -322 +323 @@
             # invalid if the keyword arguments are incorrect, or if the values
             # are not in the correct type, so we might get FieldError,
             # ValueError, ValidationError, or ?.
-            raise IncorrectLookupParameters(e)
+            raise IncorrectLookupParameters, IncorrectLookupParameters(e), sys.exc_info()[2]
 
         # Use select_related() if one of the list_display options is a field
         # with a relationship and the provided queryset doesn't already have

django/utils/http.py

@@ -136 +136 @@
         result = datetime.datetime(year, month, day, hour, min, sec)
         return calendar.timegm(result.utctimetuple())
     except Exception:
-        raise ValueError("%r is not a valid date" % date)
+        raise ValueError, ValueError("%r is not a valid date" % date), sys.exc_info()[2]
 
 def parse_http_date_safe(date):
     """