diff options
| author | Tom Christie | 2014-12-16 15:34:28 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-16 15:34:28 +0000 |
| commit | 74483338ab6a322ea5d4f2e440ba9ef3dfc0e9b5 (patch) | |
| tree | 057ae046805e1be00b6ee2386b6943ab119bea59 /rest_framework | |
| parent | b6ee784240b3c7f6cd62af5b6fe6d1014d7bf6d4 (diff) | |
| parent | a15db353bf3eea625a97cb9eb942829172f2ab9f (diff) | |
| download | django-rest-framework-74483338ab6a322ea5d4f2e440ba9ef3dfc0e9b5.tar.bz2 | |
Merge branch 'master' into version-3.1
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/settings.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 0aac6d43..6c26256a 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -48,7 +48,6 @@ DEFAULTS = { 'DEFAULT_METADATA_CLASS': 'rest_framework.metadata.SimpleMetadata', # Generic view behavior - 'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer', 'DEFAULT_PAGINATION_SERIALIZER_CLASS': 'rest_framework.pagination.PaginationSerializer', 'DEFAULT_FILTER_BACKENDS': (), @@ -124,7 +123,6 @@ IMPORT_STRINGS = ( 'DEFAULT_THROTTLE_CLASSES', 'DEFAULT_CONTENT_NEGOTIATION_CLASS', 'DEFAULT_METADATA_CLASS', - 'DEFAULT_MODEL_SERIALIZER_CLASS', 'DEFAULT_PAGINATION_SERIALIZER_CLASS', 'DEFAULT_FILTER_BACKENDS', 'EXCEPTION_HANDLER', @@ -176,8 +174,8 @@ class APISettings(object): """ def __init__(self, user_settings=None, defaults=None, import_strings=None): self.user_settings = user_settings or {} - self.defaults = defaults or {} - self.import_strings = import_strings or () + self.defaults = defaults or DEFAULTS + self.import_strings = import_strings or IMPORT_STRINGS def __getattr__(self, attr): if attr not in self.defaults.keys(): |