From b595a78210cf25fab9ecbc50fdcc0093eb56c08c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 31 Oct 2024 12:06:41 +0900 Subject: [PATCH] Drop unnecessary version check of falcon library Now zaqar requires falcon>=3.0.0 . This allows us to drop usage of distutils.version . Change-Id: I11ad898d9839d045bfae7c85bfc659f77c6392d9 --- zaqar/transport/wsgi/driver.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/zaqar/transport/wsgi/driver.py b/zaqar/transport/wsgi/driver.py index f94ef7acf..e10c72cda 100644 --- a/zaqar/transport/wsgi/driver.py +++ b/zaqar/transport/wsgi/driver.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from distutils import version as d_version import falcon import socket from wsgiref import simple_server @@ -122,16 +121,8 @@ class Driver(transport.DriverBase): ('/v2', v2_0.private_endpoints(self, self._conf)), ]) - # NOTE(wanghao): Since hook feature has removed after 1.0.0, using - # middleware instead of it, but for the compatibility with old version, - # we support them both now. Hook way can be removed after falcon - # version must be bigger than 1.0.0 in requirements. - if (d_version.LooseVersion(falcon.__version__) >= - d_version.LooseVersion("1.0.0")): - middleware = [FuncMiddleware(hook) for hook in self.before_hooks] - self.app = falcon.API(middleware=middleware) - else: - self.app = falcon.API(before=self.before_hooks) + middleware = [FuncMiddleware(hook) for hook in self.before_hooks] + self.app = falcon.API(middleware=middleware) # Set options to keep behavior compatible to pre-2.0.0 falcon self.app.req_options.auto_parse_qs_csv = True