diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2011-03-26 03:30:48 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2011-03-26 03:30:48 +0000 |
| commit | 3e18969bcbc7af31eb0fc663b9754ce55bc57dfa (patch) | |
| tree | 25c03382be38dd9f402f5e30e0a2b2786463127c | |
| parent | 8121aa60fd2dbc18dd8f4bfd42e4c1567c1199b6 (diff) | |
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
| -rw-r--r-- | django/middleware/common.py | 4 | ||||
| -rw-r--r-- | django/utils/unittest/case.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/django/middleware/common.py b/django/middleware/common.py index 07c6ff6679..2252c8f9f0 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -68,13 +68,13 @@ class CommonMiddleware(object): _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. diff --git a/django/utils/unittest/case.py b/django/utils/unittest/case.py index 8d943e2ce0..78507c1917 100644 --- a/django/utils/unittest/case.py +++ b/django/utils/unittest/case.py @@ -997,8 +997,7 @@ class TestCase(unittest.TestCase): 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.""" |