diff options
| author | Oscar Vilaplana | 2013-05-19 15:04:43 +0200 |
|---|---|---|
| committer | Oscar Vilaplana | 2013-05-19 15:04:43 +0200 |
| commit | 696c053f4fbbbb302d9b214d8daf511879256a7f (patch) | |
| tree | f1c4a533f7b2a0800705df8528143c476d1145fd | |
| parent | f1f5f92d899ae37d71234bf8a8a3ad52e20a253f (diff) | |
| download | django-rest-framework-696c053f4fbbbb302d9b214d8daf511879256a7f.tar.bz2 | |
s/Single Character/String/
| -rw-r--r-- | rest_framework/fields.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/fields.py | 4 | ||||
| -rw-r--r-- | rest_framework/tests/generics.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index b1bbb4d4..98768d72 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -33,7 +33,7 @@ from rest_framework.settings import api_settings HUMANIZED_FIELD_TYPES = { 'BooleanField': u'Boolean', - 'CharField': u'Single Character', + 'CharField': u'String', 'ChoiceField': u'Single Choice', 'ComboField': u'Single Choice', 'DateField': u'Date', diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py index 6bc37db2..3882b53f 100644 --- a/rest_framework/tests/fields.py +++ b/rest_framework/tests/fields.py @@ -885,7 +885,7 @@ class HumanizedSerializer(TestCase): self.assertEqual(humanized, { 'field1': { u'help_text': u'', u'required': True, - u'type': u'Single Character', u'label': 'field one'}, + u'type': u'String', u'label': 'field one'}, 'field2': { u'help_text': u'', u'required': True, - u'type': u'Single Character', u'label': 'field two'}}) + u'type': u'String', u'label': 'field two'}}) diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py index 2cbb55e6..38bf1990 100644 --- a/rest_framework/tests/generics.py +++ b/rest_framework/tests/generics.py @@ -133,7 +133,7 @@ class TestRootView(TestCase): #'label': None, 'read_only': False, 'required': True, - 'type': 'Single Character', + 'type': 'String', }, 'id': { # TODO add help_text and label when they are available @@ -274,7 +274,7 @@ class TestInstanceView(TestCase): #'label': None, 'read_only': False, 'required': True, - 'type': 'Single Character', + 'type': 'String', }, 'id': { # TODO uncomment label and description when they are |