Author: adrian
Date: 2011-03-25 20:30:48 -0700 (Fri, 25 Mar 2011)
New Revision: 15917
Modified:
django/trunk/django/middleware/common.py
django/trunk/django/utils/unittest/case.py
Log:
Fixed #15635 -- Converted two legacy old-style raise statements. Thanks,
DaNmarner
Modified: django/trunk/django/middleware/common.py
===================================================================
--- django/trunk/django/middleware/common.py 2011-03-26 03:13:22 UTC (rev
15916)
+++ django/trunk/django/middleware/common.py 2011-03-26 03:30:48 UTC (rev
15917)
@@ -68,13 +68,13 @@
_is_valid_path("%s/" % request.path_info, urlconf)):
new_url[1] = new_url[1] + '/'
if settings.DEBUG and request.method == 'POST':
- raise RuntimeError, (""
+ raise RuntimeError((""
"You called this URL via POST, but the URL doesn't end "
"in a slash and you have APPEND_SLASH set. Django can't "
"redirect to the slash URL while maintaining POST data. "
"Change your form to point to %s%s (note the trailing "
"slash), or set APPEND_SLASH=False in your Django "
- "settings.") % (new_url[0], new_url[1])
+ "settings.") % (new_url[0], new_url[1]))
if new_url == old_url:
# No redirects required.
Modified: django/trunk/django/utils/unittest/case.py
===================================================================
--- django/trunk/django/utils/unittest/case.py 2011-03-26 03:13:22 UTC (rev
15916)
+++ django/trunk/django/utils/unittest/case.py 2011-03-26 03:30:48 UTC (rev
15917)
@@ -997,9 +997,8 @@
excName = expected_exception.__name__
else:
excName = str(expected_exception)
- raise self.failureException, "%s not raised" % excName
+ raise self.failureException("%s not raised" % excName)
-
def assertRegexpMatches(self, text, expected_regexp, msg=None):
"""Fail the test unless the text matches the regular expression."""
if isinstance(expected_regexp, basestring):
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
