From d2a295f9bd96a6317173f1d38f79907a8373ef52 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Thu, 10 Aug 2017 23:01:42 +0300 Subject: main/py-django-oscar: upgrade to 1.5 --- ...07-Fix-widgets.ImageInput-for-Django-1.11.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 main/py-django-oscar/0007-Fix-widgets.ImageInput-for-Django-1.11.patch (limited to 'main/py-django-oscar/0007-Fix-widgets.ImageInput-for-Django-1.11.patch') diff --git a/main/py-django-oscar/0007-Fix-widgets.ImageInput-for-Django-1.11.patch b/main/py-django-oscar/0007-Fix-widgets.ImageInput-for-Django-1.11.patch deleted file mode 100644 index c47f8a33e0..0000000000 --- a/main/py-django-oscar/0007-Fix-widgets.ImageInput-for-Django-1.11.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b7a50dce837006f8643e59a40a164a75010138e8 Mon Sep 17 00:00:00 2001 -From: Michael van Tellingen -Date: Sun, 30 Apr 2017 10:15:08 +0200 -Subject: [PATCH 7/8] Fix widgets.ImageInput for Django 1.11 - -The FileInput.format_value returns None instead of the passed value -in Django 1.11. Remove the usage of format_value since it was a noop -before Django 1.11 anyway - -Fixes #2334 ---- - src/oscar/forms/widgets.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/oscar/forms/widgets.py b/src/oscar/forms/widgets.py -index 6f0f5e7..2a03919 100644 ---- a/src/oscar/forms/widgets.py -+++ b/src/oscar/forms/widgets.py -@@ -48,8 +48,7 @@ class ImageInput(FileInput): - # can't display images that aren't stored - image_url = '' - else: -- image_url = final_attrs['value'] = force_text( -- self._format_value(value)) -+ image_url = final_attrs['value'] = value - - return render_to_string(self.template_name, { - 'input_attrs': flatatt(final_attrs), --- -2.9.4 - -- cgit v1.2.3