test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #15635 -- Converted two legacy old-style raise statements. Thanks, DaNmarner 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2011-03-26 03:30:48 +00:00
parent 8121aa60fd
commit 3e18969bcb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/middleware/common.py
View File

@ -68,13 +68,13 @@ class CommonMiddleware(object):
_is_valid_path("%s/" % request.path_info, urlconf)): _is_valid_path("%s/" % request.path_info, urlconf)):
new_url[1] = new_url[1] + '/' new_url[1] = new_url[1] + '/'
if settings.DEBUG and request.method == 'POST': if settings.DEBUG and request.method == 'POST':
raise RuntimeError, ("" raise RuntimeError((""
"You called this URL via POST, but the URL doesn't end " "You called this URL via POST, but the URL doesn't end "
"in a slash and you have APPEND_SLASH set. Django can't " "in a slash and you have APPEND_SLASH set. Django can't "
"redirect to the slash URL while maintaining POST data. " "redirect to the slash URL while maintaining POST data. "
"Change your form to point to %s%s (note the trailing " "Change your form to point to %s%s (note the trailing "
"slash), or set APPEND_SLASH=False in your Django " "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: if new_url == old_url:
# No redirects required. # No redirects required.

3
django/utils/unittest/case.py
View File

@ -997,8 +997,7 @@ class TestCase(unittest.TestCase):
excName = expected_exception.__name__ excName = expected_exception.__name__
else: else:
excName = str(expected_exception) 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): def assertRegexpMatches(self, text, expected_regexp, msg=None):
"""Fail the test unless the text matches the regular expression.""" """Fail the test unless the text matches the regular expression."""