From cd175c837ffc792c81ebdd88e67553f5914c3dd0 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 2 Apr 2020 16:24:15 +0200 Subject: [PATCH] misc: use django-import-export >=1,<2 (#41273) --- debian/control | 4 ++-- setup.py | 2 +- src/authentic2/manager/resources.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index c2fc8b56d..cc32bd0b5 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Depends: ${misc:Depends}, ${python:Depends}, python-django-select2 (>= 5), python-gadjo (>= 0.53), python-django-tables2 (>= 1), - python-django-import-export (>= 0.2.7), - python-django-import-export (<= 0.4.5), + python-django-import-export (>= 1), + python-django-import-export (< 2), python-djangorestframework (>= 3.3), python-markdown (>= 2.1), python-ldap (>= 2.4), diff --git a/setup.py b/setup.py index bcb07e5f6..8b5c267e8 100755 --- a/setup.py +++ b/setup.py @@ -124,7 +124,7 @@ setup(name="authentic2", 'django-tables2>=1.0,<2.0', 'django-ratelimit', 'gadjo>=0.53', - 'django-import-export>=0.2.7,<=0.4.5', + 'django-import-export>=1,<2', 'djangorestframework>=3.3,<3.5', 'six>=1', 'Markdown>=2.1', diff --git a/src/authentic2/manager/resources.py b/src/authentic2/manager/resources.py index 539eea800..0ebd565f6 100644 --- a/src/authentic2/manager/resources.py +++ b/src/authentic2/manager/resources.py @@ -30,7 +30,7 @@ class ListWidget(Widget): def clean(self, value): raise NotImplementedError - def render(self, value): + def render(self, value, object): return u', '.join(map(six.text_type, value.all()))