mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-01-23 15:54:16 +03:00
Don't need to support Django 1.4 with FilePathField.
This commit is contained in:
parent
8d7c0a8474
commit
877e964d7e
|
@ -257,21 +257,3 @@ def set_rollback():
|
|||
else:
|
||||
# transaction not managed
|
||||
pass
|
||||
|
||||
|
||||
def get_filepathfield(path, match=None, recursive=False, allow_files=True,
|
||||
allow_folders=False, required=None):
|
||||
"""Create proper Django FilePathField with allowed kwargs."""
|
||||
|
||||
if django.VERSION < (1, 5):
|
||||
# django field doesn't have allow_folders, allow_files kwargs
|
||||
field = DjangoFilePathField(
|
||||
path, match=match, recursive=recursive, required=required
|
||||
)
|
||||
else:
|
||||
field = DjangoFilePathField(
|
||||
path, match=match, recursive=recursive, allow_files=allow_files,
|
||||
allow_folders=allow_folders, required=required
|
||||
)
|
||||
|
||||
return field
|
||||
|
|
|
@ -12,6 +12,7 @@ from django.conf import settings
|
|||
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.core.validators import RegexValidator, ip_address_validators
|
||||
from django.forms import FilePathField as DjangoFilePathField
|
||||
from django.forms import ImageField as DjangoImageField
|
||||
from django.utils import six, timezone
|
||||
from django.utils.dateparse import parse_date, parse_datetime, parse_time
|
||||
|
@ -23,7 +24,7 @@ from rest_framework import ISO_8601
|
|||
from rest_framework.compat import (
|
||||
EmailValidator, MaxLengthValidator, MaxValueValidator, MinLengthValidator,
|
||||
MinValueValidator, OrderedDict, URLValidator, duration_string,
|
||||
get_filepathfield, parse_duration, unicode_repr, unicode_to_repr
|
||||
parse_duration, unicode_repr, unicode_to_repr
|
||||
)
|
||||
from rest_framework.exceptions import ValidationError
|
||||
from rest_framework.settings import api_settings
|
||||
|
@ -713,8 +714,9 @@ class FilePathField(CharField):
|
|||
allow_folders=False, required=None, **kwargs):
|
||||
super(FilePathField, self).__init__(**kwargs)
|
||||
|
||||
# create field and get options to avoid code duplication
|
||||
field = get_filepathfield(
|
||||
# Defer to Django's FilePathField implmentation to get the
|
||||
# valid set of choices.
|
||||
field = DjangoFilePathField(
|
||||
path, match=match, recursive=recursive, allow_files=allow_files,
|
||||
allow_folders=allow_folders, required=required
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue
Block a user