Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed import order settings
  • Loading branch information
lsanpablo committed Dec 17, 2015
commit 62e2a9706f1848603bb67bba8ed1c8886fe51585
2 changes: 1 addition & 1 deletion rest_framework/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
REST framework settings, checking for user settings first, then falling
back to the defaults.
"""
import warnings
from __future__ import unicode_literals
import warnings

from django.conf import settings
from django.test.signals import setting_changed
Expand Down
1 change: 1 addition & 0 deletions tests/test_settings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from __future__ import unicode_literals
import warnings

from django.test import TestCase

Expand Down