diff options
| author | Oscar Vilaplana | 2013-05-19 15:18:40 +0200 |
|---|---|---|
| committer | Oscar Vilaplana | 2013-05-19 15:18:40 +0200 |
| commit | 6bbedfd7ae25655d94281764cb375fc7c2d0c13a (patch) | |
| tree | 4d23d8e886312c92a8796647118d48bf1075d5a2 /rest_framework/tests/fields.py | |
| parent | e80488b6192580c7a731114e58edd718d1c79120 (diff) | |
| parent | 31893cff745b8cb62c3cc98b7103af2860eca319 (diff) | |
| download | django-rest-framework-6bbedfd7ae25655d94281764cb375fc7c2d0c13a.tar.bz2 | |
fixed merge conflict
Diffstat (limited to 'rest_framework/tests/fields.py')
| -rw-r--r-- | rest_framework/tests/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py index 3882b53f..13df769f 100644 --- a/rest_framework/tests/fields.py +++ b/rest_framework/tests/fields.py @@ -846,7 +846,7 @@ class HumanizedFieldType(TestCase): """ self.assertIsInstance(humanized, unicode) - self.assertTrue(humanized) + self.assertNotEqual(humanized, '') class HumanizedField(TestCase): |