openstack/zaqar
Code Issues Proposed changes

Drop unnecessary version check of falcon library

Browse Source 
Now zaqar requires falcon>=3.0.0 . This allows us to drop usage
of distutils.version .

Change-Id: I11ad898d9839d045bfae7c85bfc659f77c6392d9
This commit is contained in:
Takashi Kajinami 2024-10-31 12:06:41 +09:00
parent fecef8a839
commit b595a78210
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zaqar/transport/wsgi/driver.py
View File

@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from distutils import version as d_version
import falcon import falcon
import socket import socket
from wsgiref import simple_server from wsgiref import simple_server
@ -122,16 +121,8 @@ class Driver(transport.DriverBase):
('/v2', v2_0.private_endpoints(self, self._conf)), ('/v2', v2_0.private_endpoints(self, self._conf)),
]) ])
# NOTE(wanghao): Since hook feature has removed after 1.0.0, using middleware = [FuncMiddleware(hook) for hook in self.before_hooks]
# middleware instead of it, but for the compatibility with old version, self.app = falcon.API(middleware=middleware)
# 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)
# Set options to keep behavior compatible to pre-2.0.0 falcon # Set options to keep behavior compatible to pre-2.0.0 falcon
self.app.req_options.auto_parse_qs_csv = True self.app.req_options.auto_parse_qs_csv = True