summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-05 12:46:14 +0000
committerGerrit Code Review <review@openstack.org>2017-07-05 12:46:14 +0000
commit7af4801aad4243c73eaa3d092c92d823cda89510 (patch)
tree5b5273c57877f3aae2f295c1f53af10372ef3c6c
parent0d83fef4b3e835f6c64a34a6a40d4ffccbcb9c0f (diff)
parenta5fa896250e9564b7b65f46e36e46a56ed60cc02 (diff)
downloadoslo-middleware-7af4801aad4243c73eaa3d092c92d823cda89510.tar.gz
Merge "Replace deprecated inspect function in Python 3"3.29.2
-rw-r--r--oslo_middleware/base.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/oslo_middleware/base.py b/oslo_middleware/base.py
index de98288..ed2e3bb 100644
--- a/oslo_middleware/base.py
+++ b/oslo_middleware/base.py
@@ -15,7 +15,13 @@
"""Base class(es) for WSGI Middleware."""
-from inspect import getargspec
+import six
+
+if six.PY2:
+ from inspect import getargspec as getfullargspec
+else:
+ from inspect import getfullargspec
+
import webob.dec
import webob.request
import webob.response
@@ -124,7 +130,7 @@ class ConfigurableMiddleware(object):
return response
response = req.get_response(self.application)
- (args, varargs, varkw, defaults) = getargspec(self.process_response)
+ args = getfullargspec(self.process_response)[0]
if 'request' in args:
return self.process_response(response, request=req)
return self.process_response(response)