From 7129b9c5aada33f590a82f62630ae10d6ca3aa8d Mon Sep 17 00:00:00 2001 From: Marc Date: Fri, 8 Jan 2016 20:15:31 +0100 Subject: [PATCH] Fixing lint errors relative to import order --- rest_framework/reverse.py | 6 +++--- tests/test_namespaces.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index 603aaf730..3aa4c7a77 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -3,9 +3,9 @@ Provide urlresolver functions that return fully qualified URLs or view names """ from __future__ import unicode_literals -from django.conf import urls, settings -from django.core.urlresolvers import reverse as django_reverse, resolve -from django.core.urlresolvers import NoReverseMatch +from django.conf import settings, urls +from django.core.urlresolvers import reverse as django_reverse +from django.core.urlresolvers import NoReverseMatch, resolve from django.http import Http404 from django.utils import six from django.utils.functional import lazy diff --git a/tests/test_namespaces.py b/tests/test_namespaces.py index a4e4c2e1e..999b410dd 100644 --- a/tests/test_namespaces.py +++ b/tests/test_namespaces.py @@ -1,11 +1,12 @@ -from django.conf.urls import url, include +from django.conf.urls import include, url from django.db import models + from rest_framework import serializers, status, viewsets from rest_framework.reverse import reverse from rest_framework.routers import DefaultRouter from rest_framework.test import APIRequestFactory, APITestCase -from .urls import urlpatterns +from .urls import urlpatterns factory = APIRequestFactory()