Resolve some warnings in the test suite

src/pretix/api/views/organizer.py

@@ -58,7 +58,7 @@ class SeatingPlanViewSet(viewsets.ModelViewSet):
     write_permission = 'can_change_organizer_settings'
 
     def get_queryset(self):
-        return self.request.organizer.seating_plans.all()
+        return self.request.organizer.seating_plans.order_by('name')
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
@@ -195,7 +195,7 @@ class TeamViewSet(viewsets.ModelViewSet):
     write_permission = 'can_change_teams'
 
     def get_queryset(self):
-        return self.request.organizer.teams.all()
+        return self.request.organizer.teams.order_by('pk')
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
@@ -268,7 +268,7 @@ class TeamInviteViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyMo
         return get_object_or_404(self.request.organizer.teams, pk=self.kwargs.get('team'))
 
     def get_queryset(self):
-        return self.team.invites.all()
+        return self.team.invites.order_by('email')
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
@@ -305,7 +305,7 @@ class TeamAPITokenViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
         return get_object_or_404(self.request.organizer.teams, pk=self.kwargs.get('team'))
 
     def get_queryset(self):
-        return self.team.tokens.all()
+        return self.team.tokens.order_by('name')
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()

src/pretix/control/permissions.py

@@ -1,7 +1,8 @@
+from urllib.parse import quote
+
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect
 from django.urls import reverse
-from django.utils.http import urlquote
 from django.utils.translation import ugettext as _
 
 
@@ -93,7 +94,7 @@ def administrator_permission_required():
                 raise PermissionDenied()
             if not request.user.has_active_staff_session(request.session.session_key):
                 if request.user.is_staff:
-                    return redirect(reverse('control:user.sudo') + '?next=' + urlquote(request.path))
+                    return redirect(reverse('control:user.sudo') + '?next=' + quote(request.path))
                 raise PermissionDenied(_('You do not have permission to view this content.'))
             return function(request, *args, **kw)
         return wrapper

src/pretix/plugins/paypal/payment.py

@@ -10,7 +10,6 @@ from django.core import signing
 from django.http import HttpRequest
 from django.template.loader import get_template
 from django.urls import reverse
-from django.utils.http import urlquote
 from django.utils.translation import ugettext as __, ugettext_lazy as _
 from i18nfield.strings import LazyI18nString
 from paypalrestsdk.exceptions import BadRequest
@@ -145,7 +144,7 @@ class Paypal(BasePaymentProvider):
                 client_secret=self.settings.connect_secret_key,
                 openid_client_id=self.settings.connect_client_id,
                 openid_client_secret=self.settings.connect_secret_key,
-                openid_redirect_uri=urlquote(build_global_uri('plugins:paypal:oauth.return')))
+                openid_redirect_uri=urllib.parse.quote(build_global_uri('plugins:paypal:oauth.return')))
         else:
             paypalrestsdk.set_config(
                 mode="sandbox" if "sandbox" in self.settings.get('endpoint') else 'live',

src/pretix/plugins/stripe/payment.py

@@ -15,7 +15,6 @@ from django.http import HttpRequest
 from django.template.loader import get_template
 from django.urls import reverse
 from django.utils.crypto import get_random_string
-from django.utils.http import urlquote
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 from django.utils.translation import pgettext, ugettext, ugettext_lazy as _
@@ -61,7 +60,7 @@ class StripeSettingsHolder(BasePaymentProvider):
         ).format(
             self.settings.connect_client_id,
             request.session['payment_stripe_oauth_token'],
-            urlquote(build_global_uri('plugins:stripe:oauth.return')),
+            urllib.parse.quote(build_global_uri('plugins:stripe:oauth.return')),
         )
 
     def settings_content_render(self, request):