summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel de Medeiros Queiroz <samueldmq@gmail.com>2017-06-19 14:46:15 -0400
committerSamuel de Medeiros Queiroz <samueldmq@gmail.com>2017-06-27 23:37:39 -0400
commita5fa896250e9564b7b65f46e36e46a56ed60cc02 (patch)
treea8e6b616c32e32df10d24c4f1813cb75ee6a79c4
parent3d6505374192840b23ff6e955a4519ba99daa677 (diff)
downloadoslo-middleware-a5fa896250e9564b7b65f46e36e46a56ed60cc02.tar.gz
Replace deprecated inspect function in Python 3
Replace deprecated inspect.getargspec [1] with inspect.getfullargspec [2], which is not deprecated in Python 3.x inspect.getargspec is kept for Python 2.x, as the new function is not available for it. This was causing keystone unit tests output to be flooded with deprecation warnings [3] [1] https://docs.python.org/3/library/inspect.html#inspect.getargspec [2] https://docs.python.org/3/library/inspect.html#inspect.getfullargspec [3] http://logs.openstack.org/43/474543/3/check/gate-keystone-python35/ae16a96/console.html.gz#_2017-06-15_22_15_16_925141 Change-Id: Ia37ac562122d6315be1ce1277a6753a9caf15998
-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)