diff options
| -rw-r--r-- | rest_framework/fields.py | 5 | ||||
| -rw-r--r-- | rest_framework/tests/fields.py | 4 | ||||
| -rw-r--r-- | rest_framework/tests/generics.py | 4 | ||||
| -rw-r--r-- | rest_framework/tests/views.py | 5 |
4 files changed, 11 insertions, 7 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index b1bbb4d4..cdcb0ee9 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', @@ -137,7 +137,8 @@ def humanize_field(field): 'type': humanize_field_type(field.__class__), 'required': getattr(field, 'required', False), } - optional_attrs = ['read_only', 'help_text', 'label'] + optional_attrs = ['read_only', 'help_text', 'label', + 'min_length', 'max_length'] for attr in optional_attrs: if getattr(field, attr, None) is not None: humanized[attr] = getattr(field, attr) diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py index d0b35241..13df769f 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 diff --git a/rest_framework/tests/views.py b/rest_framework/tests/views.py index 994cf6dc..2767d24c 100644 --- a/rest_framework/tests/views.py +++ b/rest_framework/tests/views.py @@ -1,12 +1,15 @@ from __future__ import unicode_literals + +import copy + from django.test import TestCase from django.test.client import RequestFactory + from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework.settings import api_settings from rest_framework.views import APIView -import copy factory = RequestFactory() |