diff --git a/zaqar/common/transport/wsgi/helpers.py b/zaqar/common/transport/wsgi/helpers.py index 6ea9f24d3..fad390d03 100644 --- a/zaqar/common/transport/wsgi/helpers.py +++ b/zaqar/common/transport/wsgi/helpers.py @@ -15,7 +15,7 @@ """wsgi transport helpers.""" -from distutils.version import LooseVersion +from distutils import version import uuid import falcon @@ -103,8 +103,9 @@ def extract_project_id(req, resp, params): u'string. Specify the right header ' u'X-PROJECT-ID and retry.')) - api_version = LooseVersion(api_version_string) - if not params['project_id'] and api_version >= LooseVersion('v1.1'): + api_version = version.LooseVersion(api_version_string) + if (not params['project_id'] and api_version >= + version.LooseVersion('v1.1')): raise falcon.HTTPBadRequest('Project-Id Missing', _(u'The header X-PROJECT-ID was missing')) diff --git a/zaqar/transport/wsgi/driver.py b/zaqar/transport/wsgi/driver.py index 058d611a2..87938525d 100644 --- a/zaqar/transport/wsgi/driver.py +++ b/zaqar/transport/wsgi/driver.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from distutils.version import LooseVersion +from distutils import version as d_version from wsgiref import simple_server import falcon @@ -121,7 +121,8 @@ class Driver(transport.DriverBase): # 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 LooseVersion(falcon.__version__) >= LooseVersion("1.0.0"): + 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: