diff options
| author | Tim Graham <timograham@gmail.com> | 2015-09-02 18:36:09 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-23 19:31:10 -0400 |
| commit | 6eed9ae747a0178de817da2e56bd09e73bee84ad (patch) | |
| tree | cd75546652a242202eb60d0617734476769b79c8 /django | |
| parent | b6e6fcf326ff3b008ccd7e935c391432d95bc5e2 (diff) | |
Refs #24133 -- Removed legacy formatting syntax in success_url placeholders.
Per deprecation timeline.
Diffstat (limited to 'django')
| -rw-r--r-- | django/views/generic/edit.py | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/django/views/generic/edit.py b/django/views/generic/edit.py index 9120e1dd76..ad357117c3 100644 --- a/django/views/generic/edit.py +++ b/django/views/generic/edit.py @@ -1,5 +1,4 @@ import inspect -import re import warnings from django.core.exceptions import ImproperlyConfigured @@ -13,8 +12,6 @@ from django.views.generic.detail import ( BaseDetailView, SingleObjectMixin, SingleObjectTemplateResponseMixin, ) -PERCENT_PLACEHOLDER_REGEX = re.compile(r'%\([^\)]+\)') # RemovedInDjango110Warning - class FormMixinBase(type): def __new__(cls, name, bases, attrs): @@ -173,17 +170,7 @@ class ModelFormMixin(FormMixin, SingleObjectMixin): Returns the supplied URL. """ if self.success_url: - # force_text can be removed with deprecation warning - self.success_url = force_text(self.success_url) - if PERCENT_PLACEHOLDER_REGEX.search(self.success_url): - warnings.warn( - "%()s placeholder style in success_url is deprecated. " - "Please replace them by the {} Python format syntax.", - RemovedInDjango110Warning, stacklevel=2 - ) - url = self.success_url % self.object.__dict__ - else: - url = self.success_url.format(**self.object.__dict__) + url = self.success_url.format(**self.object.__dict__) else: try: url = self.object.get_absolute_url() @@ -308,17 +295,7 @@ class DeletionMixin(object): def get_success_url(self): if self.success_url: - # force_text can be removed with deprecation warning - self.success_url = force_text(self.success_url) - if PERCENT_PLACEHOLDER_REGEX.search(self.success_url): - warnings.warn( - "%()s placeholder style in success_url is deprecated. " - "Please replace them by the {} Python format syntax.", - RemovedInDjango110Warning, stacklevel=2 - ) - return self.success_url % self.object.__dict__ - else: - return self.success_url.format(**self.object.__dict__) + return self.success_url.format(**self.object.__dict__) else: raise ImproperlyConfigured( "No URL to redirect to. Provide a success_url.") |