Fix the string_types / text_types confusion introduced in #4025#4035

lovelydinosaur merged 1 commit intoencode:masterencode/django-rest-framework:masterfrom

linovia:bug/fix_correct_string_typelinovia/django-rest-framework:bug/fix_correct_string_typeCopy head branch name to clipboard