[1.8.x] Refs #24979 -- Used inspect.getargspec() on Python 3.2.

inspect.signature() was added in Python 3.3.

2 files changed, 9 insertions, 7 deletions

diff --git a/django/db/utils.py b/django/db/utils.py
index 47dd5fd937..e442ac1fc1 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -13,6 +13,7 @@ from django.utils.deprecation import (
     RemovedInDjango19Warning, RemovedInDjango110Warning,
 )
 from django.utils.functional import cached_property
+from django.utils.inspect import HAS_INSPECT_SIGNATURE
 from django.utils.module_loading import import_string
 
 DEFAULT_DB_ALIAS = 'default'
@@ -333,7 +334,7 @@ class ConnectionRouter(object):
                 # If the router doesn't have a method, skip to the next one.
                 continue
 
-            if six.PY3:
+            if HAS_INSPECT_SIGNATURE:
                 sig = inspect.signature(router.allow_migrate)
                 has_deprecated_signature = not any(
                     p.kind == inspect.Parameter.VAR_KEYWORD for p in sig.parameters.values()
diff --git a/django/utils/inspect.py b/django/utils/inspect.py
index 3e3ad0ac23..ab584c5556 100644
--- a/django/utils/inspect.py
+++ b/django/utils/inspect.py
@@ -1,12 +1,13 @@
 from __future__ import absolute_import
 
 import inspect
+import sys
 
-from django.utils import six
+HAS_INSPECT_SIGNATURE = sys.version_info >= (3, 3)
 
 
 def getargspec(func):
-    if six.PY2:
+    if not HAS_INSPECT_SIGNATURE:
         return inspect.getargspec(func)
 
     sig = inspect.signature(func)
@@ -32,7 +33,7 @@ def getargspec(func):
 
 
 def get_func_args(func):
-    if six.PY2:
+    if not HAS_INSPECT_SIGNATURE:
         argspec = inspect.getargspec(func)
         return argspec.args[1:]  # ignore 'self'
 
@@ -44,7 +45,7 @@ def get_func_args(func):
 
 
 def func_accepts_kwargs(func):
-    if six.PY2:
+    if not HAS_INSPECT_SIGNATURE:
         # Not all callables are inspectable with getargspec, so we'll
         # try a couple different ways but in the end fall back on assuming
         # it is -- we don't want to prevent registration of valid but weird
@@ -65,7 +66,7 @@ def func_accepts_kwargs(func):
 
 
 def func_has_no_args(func):
-    args = inspect.getargspec(func)[0] if six.PY2 else [
+    args = inspect.getargspec(func)[0] if not HAS_INSPECT_SIGNATURE else [
         p for p in inspect.signature(func).parameters.values()
         if p.kind == p.POSITIONAL_OR_KEYWORD and p.default is p.empty
     ]
@@ -73,7 +74,7 @@ def func_has_no_args(func):
 
 
 def func_supports_parameter(func, parameter):
-    if six.PY3:
+    if HAS_INSPECT_SIGNATURE:
         return parameter in inspect.signature(func).parameters
     else:
         args, varargs, varkw, defaults = inspect.getargspec(func)