Skip to content

Commit 90022df

Browse files
committed
Renamed to proper REST Framework
1 parent e65463b commit 90022df

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Django REST Framework JSON CamelCase
66
:target: http://badge.fury.io/py/djangorestframework-camel-case
77

88
.. 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
1010

1111
.. 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
1313

1414

1515
Camel case JSON support for Django REST framework.

djangorestframework_camel_case/parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from rest_framework.parsers import ParseError, six
55
from django.conf import settings
66

7-
from djangorestframework_camel_case.settings import api_settings
7+
from djangorestframework_camel_case.settings import rest_framework_settings
88
from djangorestframework_camel_case.util import underscoreize
99

1010

11-
class CamelCaseJSONParser(api_settings.PARSER_CLASS):
11+
class CamelCaseJSONParser(rest_framework_settings.PARSER_CLASS):
1212
def parse(self, stream, media_type=None, parser_context=None):
1313
parser_context = parser_context or {}
1414
encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET)
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# -*- coding: utf-8 -*-
2-
from djangorestframework_camel_case.settings import api_settings
2+
from djangorestframework_camel_case.settings import rest_framework_settings
33
from djangorestframework_camel_case.util import camelize
44

55

6-
class CamelCaseJSONRenderer(api_settings.RENDERER_CLASS):
6+
class CamelCaseJSONRenderer(rest_framework_settings.RENDERER_CLASS):
77
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+
)

djangorestframework_camel_case/settings.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@
22

33
from django.conf import settings
44
from django.core.exceptions import ImproperlyConfigured
5-
65
from rest_framework.settings import APISettings
76

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)
158

169
# List of settings that may be in string import notation.
1710
IMPORT_STRINGS = (
1811
'RENDERER_CLASS',
1912
'PARSER_CLASS'
2013
)
2114

15+
DEFAULTS = {
16+
'RENDERER_CLASS': 'rest_framework.renderers.JSONRenderer',
17+
'PARSER_CLASS': 'rest_framework.parsers.JSONParser'
18+
}
19+
2220
VALID_SETTINGS = {
2321
'RENDERER_CLASS': (
2422
'rest_framework.renderers.JSONRenderer',
@@ -37,6 +35,8 @@ def validate_settings(input_settings, valid_settings):
3735
raise ImproperlyConfigured(setting_name)
3836

3937

40-
validate_settings(USER_SETTINGS, VALID_SETTINGS)
38+
validate_settings(_rest_framework_settings, VALID_SETTINGS)
4139

42-
api_settings = APISettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS)
40+
rest_framework_settings = APISettings(
41+
_rest_framework_settings, DEFAULTS, IMPORT_STRINGS
42+
)

0 commit comments

Comments
 (0)