diff options
| author | Xavier Ordoquy | 2014-02-18 11:42:35 +0100 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-02-18 11:42:35 +0100 |
| commit | b2f0f4fcf49d457aefc21960f62fcb8f2cf6770d (patch) | |
| tree | 9adabfaa8c2a73e9b1304f8d699a3f70f284634a /rest_framework/compat.py | |
| parent | 5ae94547bc08ade94c3f1df2223c0b8261cae59f (diff) | |
| parent | 822eb39599b248c68573c3095639a831ab6df99a (diff) | |
| download | django-rest-framework-b2f0f4fcf49d457aefc21960f62fcb8f2cf6770d.tar.bz2 | |
Merge remote-tracking branch 'reference/master' into feature/django_1_7
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 36f5653a..3089b7fb 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -457,7 +457,7 @@ from django.test.client import RequestFactory as DjangoRequestFactory from django.test.client import FakePayload try: # In 1.5 the test client uses force_bytes - from django.utils.encoding import force_bytes_or_smart_bytes + from django.utils.encoding import force_bytes as force_bytes_or_smart_bytes except ImportError: # In 1.3 and 1.4 the test client just uses smart_str from django.utils.encoding import smart_str as force_bytes_or_smart_bytes |