Skip to content

Fixes #4506: Support Python 3 annotations on fields callables #4508

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.

Sign up for GitHub

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

Closed
Alir3z4 wants to merge 5 commits into from
Closed

Fixes #4506: Support Python 3 annotations on fields callables #4508

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6013bcb
Fixes #4506: Support Python 3 annotations on fields callables
Alir3z4 Sep 22, 2016
fe417aa
Add getargspec to compact
Alir3z4 Sep 22, 2016
974b94d
Using getargspec from compat
Alir3z4 Sep 22, 2016
610e8ca
Better to check of existence of `signature`
Alir3z4 Sep 22, 2016
14c22bc
Coment t o show whihc python version is statement for
Alir3z4 Sep 22, 2016
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
Add getargspec to compact
  • Loading branch information
@Alir3z4
Alir3z4 committed Sep 22, 2016
commit fe417aad79abc71d817b885ec6fd4e806d7fc38c
10 changes: 10 additions & 0 deletions rest_framework/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,16 @@ def value_from_object(field, obj):
return field.value_from_object(obj)


def getargspec(obj): # type: tuple
if six.PY2:
parameters, _, _, defaults = inspect.getargspec(obj)
else:
signature = inspect.signature(obj)
parameters = signature.parameters
defaults = [i for i in parameters if i.default != inspect._empty]

return parameters, defaults

# contrib.postgres only supported from 1.8 onwards.
try:
from django.contrib.postgres import fields as postgres_fields
Expand Down