diff options
| author | Yuri Prezument | 2013-01-05 07:57:42 -0800 |
|---|---|---|
| committer | Yuri Prezument | 2013-01-05 07:57:42 -0800 |
| commit | e65f4071644c02bef9bc0cd6ad78b0441f647770 (patch) | |
| tree | 8e1641d0699518bf212a4741c400f93359b27ba0 /rest_framework/tests/generics.py | |
| parent | 8a4e2c172570933fb6da86dc9eae69027ffb6f33 (diff) | |
| parent | a061e3d9e20c4c481c2ac2eee5b17bb1430cace6 (diff) | |
| download | django-rest-framework-e65f4071644c02bef9bc0cd6ad78b0441f647770.tar.bz2 | |
Merge pull request #554 from juanriaza/master
Deprecate django.utils.simplejson in favor of Python 2.6's built-in json module
Diffstat (limited to 'rest_framework/tests/generics.py')
| -rw-r--r-- | rest_framework/tests/generics.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py index 843017eb..4799a04b 100644 --- a/rest_framework/tests/generics.py +++ b/rest_framework/tests/generics.py @@ -1,6 +1,6 @@ +import json from django.db import models from django.test import TestCase -from django.utils import simplejson as json from rest_framework import generics, serializers, status from rest_framework.tests.utils import RequestFactory from rest_framework.tests.models import BasicModel, Comment, SlugBasedModel |