Django 2.0 compatibility, Fix TablibAdmin.get_tablib_queryset function

CHANGELOG.rst

@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-3.2 (2017-04-04)
+3.5 (2025-07-30)
 ----------------
 
 * Experimental Django 1.10 support

django_tablib/admin/__init__.py

@@ -5,7 +5,7 @@
 import django
 from distutils.version import LooseVersion
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404
 
 
@@ -89,6 +89,7 @@ def get_tablib_queryset(self, request):
         search_fields = (self.get_search_fields(request)
                          if hasattr(self, 'get_search_fields')
                          else self.search_fields)
+        sortable_by = self.get_sortable_by(request)
 
         cl = ChangeList(
             request,
@@ -103,6 +104,7 @@ def get_tablib_queryset(self, request):
             self.list_max_show_all,
             self.list_editable,
             self,
+            sortable_by
         )
         return cl.get_queryset(request)
 

django_tablib/admin/actions.py

@@ -4,7 +4,7 @@
 from django import get_version
 from django.http import HttpResponse
 from django.utils.encoding import smart_str
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_tablib.datasets import SimpleDataset
 from django_tablib.base import get_content_type

django_tablib/base.py

@@ -5,8 +5,8 @@
 import tablib
 
 from django.template.defaultfilters import date
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
 
 mimetype_map = {
     'xls': 'application/vnd.ms-excel',
@@ -43,7 +43,7 @@ def _cleanval(self, value, attr):
         elif isinstance(value, (datetime.date, datetime.datetime)):
             value = date(value, 'SHORT_DATE_FORMAT')
 
-        return force_text(value)
+        return force_str(value)
 
     def _getattrs(self, obj):
         attrs = []

django_tablib/datasets.py

@@ -20,7 +20,7 @@ def __init__(self, queryset, headers=None, encoding='utf-8'):
                 # django < 1.9
                 field_names = v_qs.field_names
             headers.extend(field_names)
-            headers.extend(v_qs.query.aggregate_select)
+            headers.extend(v_qs.query.annotation_select)
 
             self.header_list = headers
             self.attr_list = headers

setup.py

@@ -6,7 +6,7 @@
 description = "A wrapper around Kenneth Reitz' tablib to work with Django " \
     "models."
 
-VERSION = '3.2'
+VERSION = '3.7'
 
 setup(
     name='django-tablib',