From e7875c50ffaa04a71c22293fb3f0bf4c1582ad9b Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 17 Mar 2021 17:40:20 +0100 Subject: [PATCH 1/2] misc: drop compatibility with django-select2 < 5 (#35569) Version 5 was released in 2015. --- bijoe/visualization/forms.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/bijoe/visualization/forms.py b/bijoe/visualization/forms.py index c6d47c2..c28b86d 100644 --- a/bijoe/visualization/forms.py +++ b/bijoe/visualization/forms.py @@ -24,18 +24,7 @@ from django.utils.safestring import mark_safe from django.forms import ModelForm, TextInput, NullBooleanField from django.conf import settings -try: - from django_select2.forms import Select2MultipleWidget - - def build_select2_multiple_widget(): - return Select2MultipleWidget() - -except ImportError: - from django_select2.widgets import Select2MultipleWidget - - def build_select2_multiple_widget(): - return Select2MultipleWidget(select2_options={'width': '100%'}) - +from django_select2.forms import Select2MultipleWidget from . import models @@ -203,7 +192,7 @@ class CubeForm(forms.Form): choices=[(s, label) for v, s, label in members], coerce=coercion_function(members), required=False, - widget=build_select2_multiple_widget()) + widget=Select2MultipleWidget()()) # group by self.base_fields['drilldown_x'] = forms.ChoiceField( -- 2.20.1