From 83574cff430280f0d9686e72dc11333875f31adb Mon Sep 17 00:00:00 2001 From: "zhiguo.li" Date: Tue, 5 Sep 2017 15:49:47 +0800 Subject: [PATCH] [Trivialfix] Remove the useless parameter 'ext_mgr' The parameter 'ext_mgr' is not used in method _setup_routes() in subclasses: manila.api.v2/router.APIRouter manila.api.v1.router.APIRouter manila.api.versions.VersionsRouter So it should be removed to make the code clean. The superclass of them is manila.api.openstack.__init__.APIRouter, the 'ext_mgr' is removed from method _setup_routers() in superclass. In method__init__() in superclass, the _setup_routers() is called, so 'ext_mgr'is removed in related calling statement. Change-Id: I25e2d5447b328c88c660ae17025f65719290b21b --- manila/api/openstack/__init__.py | 4 ++-- manila/api/v1/router.py | 2 +- manila/api/v2/router.py | 2 +- manila/api/versions.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manila/api/openstack/__init__.py b/manila/api/openstack/__init__.py index 040abc28fb..39ac6047f0 100644 --- a/manila/api/openstack/__init__.py +++ b/manila/api/openstack/__init__.py @@ -70,7 +70,7 @@ class APIRouter(base_wsgi.Router): mapper = ProjectMapper() self.resources = {} - self._setup_routes(mapper, ext_mgr) + self._setup_routes(mapper) self._setup_ext_routes(mapper, ext_mgr) self._setup_extensions(ext_mgr) super(APIRouter, self).__init__(mapper) @@ -115,5 +115,5 @@ class APIRouter(base_wsgi.Router): resource.register_actions(controller) resource.register_extensions(controller) - def _setup_routes(self, mapper, ext_mgr): + def _setup_routes(self, mapper): raise NotImplementedError diff --git a/manila/api/v1/router.py b/manila/api/v1/router.py index 4eaeed10a5..c1dfd156ff 100644 --- a/manila/api/v1/router.py +++ b/manila/api/v1/router.py @@ -48,7 +48,7 @@ class APIRouter(manila.api.openstack.APIRouter): """ ExtensionManager = extensions.ExtensionManager - def _setup_routes(self, mapper, ext_mgr): + def _setup_routes(self, mapper): self.resources['versions'] = versions.create_resource() mapper.connect("versions", "/", controller=self.resources['versions'], diff --git a/manila/api/v2/router.py b/manila/api/v2/router.py index f5a2d65ea4..f366412e62 100644 --- a/manila/api/v2/router.py +++ b/manila/api/v2/router.py @@ -61,7 +61,7 @@ class APIRouter(manila.api.openstack.APIRouter): """ ExtensionManager = extensions.ExtensionManager - def _setup_routes(self, mapper, ext_mgr): + def _setup_routes(self, mapper): self.resources["versions"] = versions.create_resource() mapper.connect("versions", "/", controller=self.resources["versions"], diff --git a/manila/api/versions.py b/manila/api/versions.py index e4238ba6a8..59da9db239 100644 --- a/manila/api/versions.py +++ b/manila/api/versions.py @@ -64,7 +64,7 @@ class VersionsRouter(openstack.APIRouter): ExtensionManager = extensions.ExtensionManager - def _setup_routes(self, mapper, ext_mgr): + def _setup_routes(self, mapper): self.resources['versions'] = create_resource() mapper.connect('versions', '/', controller=self.resources['versions'],