diff options
| author | Tom Christie | 2014-12-16 15:35:25 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-16 15:35:25 +0000 |
| commit | 7cfa0e0306456d4058f9d86f62a1b8f00e83dc41 (patch) | |
| tree | d545319fe7cfc0132b5d4500b09c58536ca50599 /rest_framework | |
| parent | 6e51e4f5cdec4f4580360a487d7bf5ebdef08709 (diff) | |
| parent | 74483338ab6a322ea5d4f2e440ba9ef3dfc0e9b5 (diff) | |
| download | django-rest-framework-7cfa0e0306456d4058f9d86f62a1b8f00e83dc41.tar.bz2 | |
Merge lateset version-3.1
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/settings.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py index b17f5fcc..da3be38d 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -49,7 +49,6 @@ DEFAULTS = { 'DEFAULT_VERSIONING_CLASS': None, # Generic view behavior - 'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer', 'DEFAULT_PAGINATION_SERIALIZER_CLASS': 'rest_framework.pagination.PaginationSerializer', 'DEFAULT_FILTER_BACKENDS': (), @@ -179,8 +178,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(): |