diff options
| author | Tom Christie | 2013-02-01 15:07:51 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-02-01 15:07:51 +0000 |
| commit | 00752dcd2a3647f2de2a259934753745597e3ade (patch) | |
| tree | bf730061dc16480f9a09da5b4916bf0d31f4fe6a /rest_framework/compat.py | |
| parent | f4f237e3ee02fef4fd5f389bf4fb3bbdd00173bd (diff) | |
| download | django-rest-framework-00752dcd2a3647f2de2a259934753745597e3ade.tar.bz2 | |
Py3k cleanup
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py index ef11b85b..8c64d951 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -7,11 +7,11 @@ from __future__ import unicode_literals import django -# Try to import six from Django, fallback to six itself (1.3.x) +# Try to import six from Django, fallback to included `six`. try: from django.utils import six except: - import six + from rest_framework import six # location of patterns, url, include changes in 1.4 onwards try: |