diff options
| author | Mads Jensen <mje@inducks.org> | 2017-03-09 16:17:41 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-06-28 14:07:55 -0400 |
| commit | 550cb3a365dee4edfdd1563224d5304de2a57fda (patch) | |
| tree | fb532f38774ff7619edd2a4532c3daae1ee0ac5a /django/utils/translation/__init__.py | |
| parent | 43a4835edf32c57eb74c0eb207c276734a34abcf (diff) | |
Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().
Diffstat (limited to 'django/utils/translation/__init__.py')
| -rw-r--r-- | django/utils/translation/__init__.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py index f342cf7227..4a6840782c 100644 --- a/django/utils/translation/__init__.py +++ b/django/utils/translation/__init__.py @@ -3,7 +3,7 @@ Internationalization support. """ import re import warnings -from contextlib import ContextDecorator +from contextlib import ContextDecorator, suppress from django.utils.deprecation import RemovedInDjango21Warning from django.utils.functional import lazy @@ -126,11 +126,9 @@ def lazy_number(func, resultclass, number=None, **kwargs): number_value = rhs kwargs['number'] = number_value translated = func(**kwargs) - try: + # String may not contain a placeholder for the number. + with suppress(TypeError): translated = translated % rhs - except TypeError: - # String doesn't contain a placeholder for the number - pass return translated proxy = lazy(lambda **kwargs: NumberAwareString(), NumberAwareString)(**kwargs) |
