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

Issue #337 #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsenecal merged 20 commits into develop from issue-337
Jul 22, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
aa962c1
Missing dependancy
jsenecal Jul 19, 2017
da0c94c
Add Django Debug Toolbar, and add a failing test setting out our perf...
aidanlister Jul 20, 2017
1d84c80
Add a helper for specifying a prefetch_for_related attribute on your ...
aidanlister Jul 20, 2017
9e284f4
Merge branch 'issue-337' into feature/add-ddt-pylint-and-test
jsenecal Jul 21, 2017
b4999e4
Merge pull request #364 from ABASystems/feature/add-ddt-pylint-and-test
jsenecal Jul 21, 2017
cacca2e
Trying to make isort happy
jsenecal Jul 21, 2017
5a7d73a
Merge pull request #365 from ABASystems/feature/auto-prefetch-helpers
jsenecal Jul 21, 2017
e96fe6c
Adding `select_related` and `prefetch_for_includes` to `CommentViewSet`
jsenecal Jul 21, 2017
8fdbc0a
Fixes ImportError on TravisCI
jsenecal Jul 21, 2017
46c3809
E265 block comment should start with '# '
jsenecal Jul 21, 2017
3c24093
E501 line too long (121 > 100 characters)
jsenecal Jul 21, 2017
151bdb9
F401 '..factories' imported but unused
jsenecal Jul 21, 2017
844e88e
Imports are (now) correctly sorted as per isort.
jsenecal Jul 21, 2017
07f67a3
Package name, not module name... woops!
jsenecal Jul 21, 2017
f924ac8
More of this isort madness
jsenecal Jul 21, 2017
97b6dd3
Use forms in the browsable API
jsenecal Jul 22, 2017
f0bda69
Updating docs to reflect the added ModelViewSet helper
jsenecal Jul 22, 2017
63020b4
Including packaging to the isort command that checks example.
jsenecal Jul 22, 2017
a7130b9
Merge branch 'issue-337' of github.com:django-json-api/django-rest-fr...
jsenecal Jul 22, 2017
7343def
Updating docs to give some context.
jsenecal Jul 22, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Trying to make isort happy
  • Loading branch information
jsenecal committed Jul 21, 2017
commit cacca2e31fc049e75580855dce46da394f199a31
4 changes: 2 additions & 2 deletions rest_framework_json_api/relations.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
import json
from collections import OrderedDict

import six

import inflection
import six
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import NoReverseMatch
from django.utils.translation import ugettext_lazy as _
from rest_framework.fields import MISSING_ERROR_MESSAGE
from rest_framework.relations import MANY_RELATION_KWARGS, PrimaryKeyRelatedField
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏 I'm a fan of any time a * import can be removed.

from rest_framework.reverse import reverse
from rest_framework.serializers import Serializer

from rest_framework_json_api.exceptions import Conflict
from rest_framework_json_api.utils import (
Hyperlink,
Expand Down
2 changes: 1 addition & 1 deletion rest_framework_json_api/serializers.py
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import inflection
from django.db.models.query import QuerySet
from django.utils import six
from django.utils.translation import ugettext_lazy as _
from rest_framework.exceptions import ParseError
from rest_framework.serializers import * # noqa: F403

from rest_framework_json_api.exceptions import Conflict
from rest_framework_json_api.relations import ResourceRelatedField
from rest_framework_json_api.utils import (
Expand Down

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