diff options
| author | Tom Christie | 2013-08-27 12:36:06 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-08-27 12:36:06 +0100 |
| commit | b54cbd292c5680f4de0e028ff1cb2a9ab1cd34ff (patch) | |
| tree | e592bbe7c26c2a467d3ada173a6f5a2c80bd7284 /rest_framework | |
| parent | b430503fa657330b606a9c632ea0decc4254163e (diff) | |
| download | django-rest-framework-b54cbd292c5680f4de0e028ff1cb2a9ab1cd34ff.tar.bz2 | |
Use view.settings for API settings, to make testing easier.
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/views.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rest_framework/views.py b/rest_framework/views.py index 7cb71ccf..4cff0422 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -79,8 +79,8 @@ def exception_handler(exc): class APIView(View): - settings = api_settings + # The following policies may be set at either globally, or per-view. renderer_classes = api_settings.DEFAULT_RENDERER_CLASSES parser_classes = api_settings.DEFAULT_PARSER_CLASSES authentication_classes = api_settings.DEFAULT_AUTHENTICATION_CLASSES @@ -88,6 +88,9 @@ class APIView(View): permission_classes = api_settings.DEFAULT_PERMISSION_CLASSES content_negotiation_class = api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS + # Allow dependancy injection of other settings to make testing easier. + settings = api_settings + @classmethod def as_view(cls, **initkwargs): """ @@ -178,7 +181,7 @@ class APIView(View): Return the view name, as used in OPTIONS responses and in the browsable API. """ - func = api_settings.VIEW_NAME_FUNCTION + func = self.settings.VIEW_NAME_FUNCTION return func(self.__class__, getattr(self, 'suffix', None)) def get_view_description(self, html=False): @@ -186,7 +189,7 @@ class APIView(View): Return some descriptive text for the view, as used in OPTIONS responses and in the browsable API. """ - func = api_settings.VIEW_DESCRIPTION_FUNCTION + func = self.settings.VIEW_DESCRIPTION_FUNCTION return func(self.__class__, html) # API policy instantiation methods |