diff options
| author | Antonio Garcia-Dominguez <antonio.garciadominguez@uca.es> | 2015-04-29 17:38:20 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-05-04 09:44:18 -0400 |
| commit | 5c412dd8a724b263489c1bd7a2fea381460665d7 (patch) | |
| tree | 7c2effdd82a484b87472c6c6f7bf3a7a8a6718f9 /django/forms/widgets.py | |
| parent | 81f76517288eb386304f9cae23873b865945bc82 (diff) | |
Fixes #24727 -- Prevented ClearableFileInput from masking exceptions on Python 2
Diffstat (limited to 'django/forms/widgets.py')
| -rw-r--r-- | django/forms/widgets.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 4d7565ce9c..de6f8490eb 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -377,6 +377,14 @@ class ClearableFileInput(FileInput): """ Return whether value is considered to be initial value. """ + # hasattr() masks exceptions on Python 2. + if six.PY2: + try: + getattr(value, 'url') + except AttributeError: + return False + else: + return bool(value) return bool(value and hasattr(value, 'url')) def get_template_substitution_values(self, value): |
