diff options
| author | Xavier Ordoquy | 2012-11-22 07:48:41 +0100 |
|---|---|---|
| committer | Xavier Ordoquy | 2012-11-22 07:48:41 +0100 |
| commit | be003145ca120708db51db4e85f6088bde8dce1c (patch) | |
| tree | 9df0e343b9adc196ddd7e5fbc1b93e4c339260b2 /rest_framework/tests/parsers.py | |
| parent | 91190487b747f0c9c09ecd5678f719bb2e745d27 (diff) | |
| parent | 606c20f012c5a1fdcfd661eb280bab22b94afcf5 (diff) | |
| download | django-rest-framework-be003145ca120708db51db4e85f6088bde8dce1c.tar.bz2 | |
Merge branch 'p3k' of github.com:linovia/django-rest-framework into p3k
Diffstat (limited to 'rest_framework/tests/parsers.py')
| -rw-r--r-- | rest_framework/tests/parsers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/tests/parsers.py b/rest_framework/tests/parsers.py index 8ab8a52f..ffa39b1f 100644 --- a/rest_framework/tests/parsers.py +++ b/rest_framework/tests/parsers.py @@ -131,7 +131,7 @@ # self.assertEqual(data['key1'], 'val1') # self.assertEqual(files['file1'].read(), 'blablabla') -from StringIO import StringIO +from rest_framework.compat import StringIO from django import forms from django.test import TestCase from rest_framework.parsers import FormParser |