From 5d425b36bf8cacc2ac84c84d89084a889d7b1b1a Mon Sep 17 00:00:00 2001 From: DaNmarner Date: Thu, 17 Mar 2011 12:06:14 -0500 Subject: [PATCH] Made raise in docs the new style --- django/middleware/common.py | 4 ++-- django/utils/unittest/case.py | 2 +- docs/howto/custom-template-tags.txt | 14 +++++++------- docs/ref/templates/api.txt | 2 +- docs/topics/forms/formsets.txt | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/django/middleware/common.py b/django/middleware/common.py index 07c6ff6..2252c8f 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 8d943e2..e284800 100644 --- a/django/utils/unittest/case.py +++ b/django/utils/unittest/case.py @@ -997,7 +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): diff --git a/docs/howto/custom-template-tags.txt b/docs/howto/custom-template-tags.txt index ec4cd35..7dc6cce 100644 --- a/docs/howto/custom-template-tags.txt +++ b/docs/howto/custom-template-tags.txt @@ -351,9 +351,9 @@ object:: # split_contents() knows not to split quoted strings. tag_name, format_string = token.split_contents() except ValueError: - raise template.TemplateSyntaxError, "%r tag requires a single argument" % token.contents.split()[0] + raise template.TemplateSyntaxError("%r tag requires a single argument" % token.contents.split()[0]) if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")): - raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name + raise template.TemplateSyntaxError("%r tag's argument should be in quotes" % tag_name) return CurrentTimeNode(format_string[1:-1]) Notes: @@ -596,9 +596,9 @@ Now your tag should begin to look like this:: # split_contents() knows not to split quoted strings. tag_name, date_to_be_formatted, format_string = token.split_contents() except ValueError: - raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0] + raise template.TemplateSyntaxError("%r tag requires exactly two arguments" % token.contents.split()[0]) if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")): - raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name + raise template.TemplateSyntaxError("%r tag's argument should be in quotes" % tag_name) return FormatTimeNode(date_to_be_formatted, format_string[1:-1]) You also have to change the renderer to retrieve the actual contents of the @@ -863,13 +863,13 @@ class, like so:: # Splitting by None == splitting by spaces. tag_name, arg = token.contents.split(None, 1) except ValueError: - raise template.TemplateSyntaxError, "%r tag requires arguments" % token.contents.split()[0] + raise template.TemplateSyntaxError("%r tag requires arguments" % token.contents.split()[0]) m = re.search(r'(.*?) as (\w+)', arg) if not m: - raise template.TemplateSyntaxError, "%r tag had invalid arguments" % tag_name + raise template.TemplateSyntaxError("%r tag had invalid arguments" % tag_name) format_string, var_name = m.groups() if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")): - raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name + raise template.TemplateSyntaxError("%r tag's argument should be in quotes" % tag_name) return CurrentTimeNode3(format_string[1:-1], var_name) The difference here is that ``do_current_time()`` grabs the format string and diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index ba78f15..4cfa4da 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -170,7 +170,7 @@ straight lookups. Here are some things to keep in mind: >>> t = Template("My name is {{ person.first_name }}.") >>> class PersonClass3: ... def first_name(self): - ... raise AssertionError, "foo" + ... raise AssertionError("foo") >>> p = PersonClass3() >>> t.render(Context({"person": p})) Traceback (most recent call last): diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt index 41438f2..a3721fd 100644 --- a/docs/topics/forms/formsets.txt +++ b/docs/topics/forms/formsets.txt @@ -216,7 +216,7 @@ is where you define your own validation that works at the formset level:: ... form = self.forms[i] ... title = form.cleaned_data['title'] ... if title in titles: - ... raise forms.ValidationError, "Articles in a set must have distinct titles." + ... raise forms.ValidationError("Articles in a set must have distinct titles.") ... titles.append(title) >>> ArticleFormSet = formset_factory(ArticleForm, formset=BaseArticleFormSet) -- 1.7.1