From 29d8796b1d96cbe77ecd81663ee7afbace0229e0 Mon Sep 17 00:00:00 2001 From: Rollo Konig Brock Date: Wed, 31 Mar 2021 17:59:22 +0100 Subject: [PATCH] isort --- rest_framework/pagination.py | 5 ++--- tests/test_cursor_pagination.py | 5 +++-- tests/test_pagination.py | 9 ++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 2b51b3295..26898a9a6 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -3,18 +3,17 @@ Pagination serializers determine the structure of the output that should be used for paginated responses. """ import operator - from base64 import b64decode, b64encode from collections import OrderedDict, namedtuple -from urllib import parse from functools import reduce +from urllib import parse from django.core.paginator import InvalidPage from django.core.paginator import Paginator as DjangoPaginator +from django.db.models.query import Q from django.template import loader from django.utils.encoding import force_str from django.utils.translation import gettext_lazy as _ -from django.db.models.query import Q from rest_framework.compat import coreapi, coreschema from rest_framework.exceptions import NotFound diff --git a/tests/test_cursor_pagination.py b/tests/test_cursor_pagination.py index f655cc97f..67877b8e1 100644 --- a/tests/test_cursor_pagination.py +++ b/tests/test_cursor_pagination.py @@ -4,14 +4,15 @@ from base64 import b64encode from urllib import parse import pytest + from rest_framework import generics -from rest_framework.pagination import Cursor, CursorPagination from rest_framework.filters import OrderingFilter +from rest_framework.pagination import Cursor, CursorPagination from rest_framework.permissions import AllowAny from rest_framework.serializers import ModelSerializer from rest_framework.test import APIRequestFactory -from .models import ExamplePaginationModel +from .models import ExamplePaginationModel factory = APIRequestFactory() diff --git a/tests/test_pagination.py b/tests/test_pagination.py index fb3182b51..953818380 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -1,21 +1,20 @@ -import pytest -import re import operator - +import re from unittest.mock import Mock +import pytest from django.core.paginator import Paginator as DjangoPaginator -from django.db.models.query_utils import Q from django.db import models +from django.db.models.query_utils import Q from django.test import TestCase from rest_framework import ( exceptions, filters, generics, pagination, serializers, status ) -from rest_framework.utils import json from rest_framework.pagination import PAGE_BREAK, PageLink from rest_framework.request import Request from rest_framework.test import APIRequestFactory +from rest_framework.utils import json factory = APIRequestFactory()