encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-23 01:57:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix FilePathField kwargs for django < 1.5

Browse Source
This commit is contained in:
Aider Ibragimov 2015-03-03 16:58:04 +03:00
parent 04cc1964bd
commit e5d95e319e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rest_framework/fields.py
View File

@ -23,6 +23,7 @@ import collections
import copy import copy
import datetime import datetime
import decimal import decimal
import django
import inspect import inspect
import re import re
import uuid import uuid
@ -665,11 +666,18 @@ class FilePathField(CharField):
def __init__(self, path, match=None, recursive=False, allow_files=True, def __init__(self, path, match=None, recursive=False, allow_files=True,
allow_folders=False, required=None, **kwargs): allow_folders=False, required=None, **kwargs):
super(FilePathField, self).__init__(**kwargs) super(FilePathField, self).__init__(**kwargs)
# create field and get options to avoid code duplication # create field and get options to avoid code duplication
field = DjangoFilePathField( if django.VERSION < (1, 5):
path, match=match, recursive=recursive, allow_files=allow_files, # django field doesn't have allow_folders, allow_files kwargs
allow_folders=allow_folders, required=required 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
)
self.choices = OrderedDict(field.choices) self.choices = OrderedDict(field.choices)
self.choice_strings_to_values = dict([ self.choice_strings_to_values = dict([