Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fd316ee

Browse files
Merge branch 'docs-update'
2 parents 3fbe2b8 + 033f3a0 commit fd316ee

File tree

9 files changed

+12
-11
lines changed

9 files changed

+12
-11
lines changed

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ Tim Selman <timcbaoth@gmail.com>
3939
Tom Glowka <glowka.tom@gmail.com>
4040
Ulrich Schuster <ulrich.schuster@mailworks.org>
4141
Yaniv Peer <yanivpeer@gmail.com>
42+
Mansi Dhruv <mansi.p.dhruv@gmail.com>

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ This is the last release supporting Django 1.11, Django 2.1, Django REST Framewo
8989

9090
* Added support for serializing nested serializers as attribute json value introducing setting `JSON_API_SERIALIZE_NESTED_SERIALIZERS_AS_ATTRIBUTE`
9191
* Note: As keys of nested serializers are not json:api spec field names they are not inflected by format field names option.
92-
* Added `rest_framework_json_api.serializer.Serializer` class to support initial JSONAPI views without models.
92+
* Added `rest_framework_json_api.serializer.Serializer` class to support initial JSON:API views without models.
9393
* Note that serializers derived from this class need to define `resource_name` in their `Meta` class.
9494
* This fix might be a **BREAKING CHANGE** if you use `rest_framework_json_api.serializers.Serializer` for non json:api spec views (usually `APIView`). You need to change those serializers classes to use `rest_framework.serializers.Serializer` instead.
9595

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Reporting a Vulnerability
44

5-
If you believe you've found something in Django REST Framework JSONAPI which has security implications, please **do not raise the issue in a public forum**.
5+
If you believe you've found something in Django REST Framework JSON:API which has security implications, please **do not raise the issue in a public forum**.
66

77
Send a description of the issue via email to [rest-framework-jsonapi-security@googlegroups.com][security-mail]. The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
88

‎example/tests/test_generic_viewset.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_ember_expected_renderer(self):
5555

5656
def test_default_validation_exceptions(self):
5757
"""
58-
Default validation exceptions should conform to jsonapi spec
58+
Default validation exceptions should conform to json:api spec
5959
"""
6060
expected = {
6161
"errors": [

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# The base set of requirements for Django REST framework JSONAPI is actually
1+
# The base set of requirements for Django REST framework JSON:API is actually
22
# fairly small, but for the purposes of development and testing
33
# there are a number of packages that are useful to install.
44

‎rest_framework_json_api/exceptions.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ def exception_handler(exc, context):
2929
if not response:
3030
return response
3131

32-
# Use regular DRF format if not rendered by DRF JSONAPI and not uniform
32+
# Use regular DRF format if not rendered by DRF JSON:API and not uniform
3333
is_json_api_view = rendered_with_json_api(context["view"])
3434
is_uniform = json_api_settings.UNIFORM_EXCEPTIONS
3535
if not is_json_api_view and not is_uniform:
3636
return response
3737

38-
# Convert to DRF JSONAPI error format
38+
# Convert to DRF JSON:API error format
3939
response = utils.format_drf_errors(response, context, exc)
4040

41-
# Add top-level 'errors' object when not rendered by DRF JSONAPI
41+
# Add top-level 'errors' object when not rendered by DRF JSON:API
4242
if not is_json_api_view:
4343
response.data = utils.format_errors(response.data)
4444

‎rest_framework_json_api/renderers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def extract_attributes(cls, fields, resource):
5858
"""
5959
data = OrderedDict()
6060
for field_name, field in iter(fields.items()):
61-
# ID is always provided in the root of JSONAPI so remove it from attributes
61+
# ID is always provided in the root of JSON:API so remove it from attributes
6262
if field_name == "id":
6363
continue
6464
# don't output a key for write only fields

‎rest_framework_json_api/settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
class JSONAPISettings(object):
2222
"""
23-
A settings object that allows jsonapi settings to be access as
23+
A settings object that allows json:api settings to be access as
2424
properties.
2525
"""
2626

@@ -30,7 +30,7 @@ def __init__(self, user_settings=settings, defaults=DEFAULTS):
3030

3131
def __getattr__(self, attr):
3232
if attr not in self.defaults:
33-
raise AttributeError("Invalid JSONAPI setting: '%s'" % attr)
33+
raise AttributeError("Invalid JSON:API setting: '%s'" % attr)
3434

3535
value = getattr(
3636
self.user_settings, JSON_API_SETTINGS_PREFIX + attr, self.defaults[attr]

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def get_package_data(package):
7272
version=get_version("rest_framework_json_api"),
7373
url="https://github.com/django-json-api/django-rest-framework-json-api",
7474
license="BSD",
75-
description="A Django REST framework API adapter for the JSONAPI spec.",
75+
description="A Django REST framework API adapter for the JSON:API spec.",
7676
long_description=read("README.rst"),
7777
author="Jerel Unruh",
7878
author_email="",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /