File tree Expand file tree Collapse file tree 4 files changed +19
-18
lines changed
djangorestframework_camel_case Expand file tree Collapse file tree 4 files changed +19
-18
lines changed Original file line number Diff line number Diff line change @@ -6,10 +6,10 @@ Django REST Framework JSON CamelCase
6
6
:target: http://badge.fury.io/py/djangorestframework-camel-case
7
7
8
8
.. image :: https://travis-ci.org/vbabiy/djangorestframework-camel-case.png?branch=master
9
- :target: https://travis-ci.org/vbabiy/djangorestframework-camel-case
9
+ :target: https://travis-ci.org/vbabiy/djangorestframework-camel-case
10
10
11
11
.. image :: https://img.shields.io/pypi/v/djangorestframework-camel-case.svg
12
- :target: https://img.shields.io/pypi/v/djangorestframework-camel-case.svg
12
+ :target: https://img.shields.io/pypi/v/djangorestframework-camel-case.svg
13
13
14
14
15
15
Camel case JSON support for Django REST framework.
Original file line number Diff line number Diff line change 4
4
from rest_framework .parsers import ParseError , six
5
5
from django .conf import settings
6
6
7
- from djangorestframework_camel_case .settings import api_settings
7
+ from djangorestframework_camel_case .settings import rest_framework_settings
8
8
from djangorestframework_camel_case .util import underscoreize
9
9
10
10
11
- class CamelCaseJSONParser (api_settings .PARSER_CLASS ):
11
+ class CamelCaseJSONParser (rest_framework_settings .PARSER_CLASS ):
12
12
def parse (self , stream , media_type = None , parser_context = None ):
13
13
parser_context = parser_context or {}
14
14
encoding = parser_context .get ('encoding' , settings .DEFAULT_CHARSET )
Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
- from djangorestframework_camel_case .settings import api_settings
2
+ from djangorestframework_camel_case .settings import rest_framework_settings
3
3
from djangorestframework_camel_case .util import camelize
4
4
5
5
6
- class CamelCaseJSONRenderer (api_settings .RENDERER_CLASS ):
6
+ class CamelCaseJSONRenderer (rest_framework_settings .RENDERER_CLASS ):
7
7
def render (self , data , * args , ** kwargs ):
8
- return super (CamelCaseJSONRenderer , self ).render (camelize (data ), * args ,
9
- ** kwargs )
8
+ return super (CamelCaseJSONRenderer , self ).render (
9
+ camelize (data ), * args , ** kwargs
10
+ )
Original file line number Diff line number Diff line change 2
2
3
3
from django .conf import settings
4
4
from django .core .exceptions import ImproperlyConfigured
5
-
6
5
from rest_framework .settings import APISettings
7
6
8
-
9
- USER_SETTINGS = getattr (settings , 'JSON_CAMEL_CASE' , None )
10
-
11
- DEFAULTS = {
12
- 'RENDERER_CLASS' : 'rest_framework.renderers.JSONRenderer' ,
13
- 'PARSER_CLASS' : 'rest_framework.parsers.JSONParser'
14
- }
7
+ _rest_framework_settings = getattr (settings , 'REST_FRAMEWORK' , None )
15
8
16
9
# List of settings that may be in string import notation.
17
10
IMPORT_STRINGS = (
18
11
'RENDERER_CLASS' ,
19
12
'PARSER_CLASS'
20
13
)
21
14
15
+ DEFAULTS = {
16
+ 'RENDERER_CLASS' : 'rest_framework.renderers.JSONRenderer' ,
17
+ 'PARSER_CLASS' : 'rest_framework.parsers.JSONParser'
18
+ }
19
+
22
20
VALID_SETTINGS = {
23
21
'RENDERER_CLASS' : (
24
22
'rest_framework.renderers.JSONRenderer' ,
@@ -37,6 +35,8 @@ def validate_settings(input_settings, valid_settings):
37
35
raise ImproperlyConfigured (setting_name )
38
36
39
37
40
- validate_settings (USER_SETTINGS , VALID_SETTINGS )
38
+ validate_settings (_rest_framework_settings , VALID_SETTINGS )
41
39
42
- api_settings = APISettings (USER_SETTINGS , DEFAULTS , IMPORT_STRINGS )
40
+ rest_framework_settings = APISettings (
41
+ _rest_framework_settings , DEFAULTS , IMPORT_STRINGS
42
+ )
You can’t perform that action at this time.
0 commit comments