From 974b94dfd7a0e7db38967e8863c1a7b59b279591 Mon Sep 17 00:00:00 2001 From: Alireza Savand Date: Thu, 22 Sep 2016 12:47:31 +0400 Subject: [PATCH] Using getargspec from compat --- rest_framework/fields.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7bf9ef1e3..835739612 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -32,7 +32,8 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 from rest_framework.compat import ( - get_remote_field, unicode_repr, unicode_to_repr, value_from_object + get_remote_field, getargspec, unicode_repr, unicode_to_repr, + value_from_object ) from rest_framework.exceptions import ValidationError from rest_framework.settings import api_settings @@ -59,12 +60,9 @@ def is_simple_callable(obj): if not (function or method): return False - if six.PY2: - args, _, _, defaults = inspect.getargspec(obj) - else: - args, _, _, defaults = inspect.getfullargspec(obj)[:4] + parameters, defaults = getargspec(obj) - len_args = len(args) if function else len(args) - 1 + len_args = len(parameters) if function else len(parameters) - 1 len_defaults = len(defaults) if defaults else 0 return len_args <= len_defaults