summaryrefslogtreecommitdiff
path: root/nova/api/openstack/wsgi.py
diff options
context:
space:
mode:
authorStephen Finucane <sfinucan@redhat.com>2019-05-23 10:13:12 +0100
committerStephen Finucane <sfinucan@redhat.com>2019-06-15 16:40:00 +0100
commitdb1789e82b8ff60c5c2cc8d6699b26ef53f225e1 (patch)
tree79b5c06e07db3135d610b7df8376ce2668537894 /nova/api/openstack/wsgi.py
parent3ea5c5ee9fd31495ba77f592e4a45d086840a718 (diff)
downloadnova-db1789e82b8ff60c5c2cc8d6699b26ef53f225e1.tar.gz
Ensure controllers all call super
Currently some do and some don't. Do it by default as intended. We also remove the 'view_builder' argument from the base 'Controller.__init__' function since nothing was actually setting this. Change-Id: Ic0b16608078e4545f546509df94caba3166ed6e2 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'nova/api/openstack/wsgi.py')
-rw-r--r--nova/api/openstack/wsgi.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index b9a9b9c741..3e8ff376d2 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -756,11 +756,9 @@ class Controller(object):
_view_builder_class = None
- def __init__(self, view_builder=None):
+ def __init__(self):
"""Initialize controller with a view builder instance."""
- if view_builder:
- self._view_builder = view_builder
- elif self._view_builder_class:
+ if self._view_builder_class:
self._view_builder = self._view_builder_class()
else:
self._view_builder = None