openstack
/
heat
Code Issues Proposed changes

Merge "Trivial:remove unused import and add reasonable path in import"

changes/27/562727/6
Zuul 2018-05-07 12:42:07 +00:00 committed by Gerrit Code Review
parent cb917c983f 72b365c29c
commit b8db93abc4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/common/wsgi.py
View File

@ -38,9 +38,8 @@ from oslo_log import log as logging
from oslo_serialization import jsonutils
from oslo_utils import encodeutils
from oslo_utils import importutils
from paste import deploy
import routes
import routes.middleware
from paste.deploy import loadwsgi
from routes import middleware
import six
import webob.dec
import webob.exc
@ -693,8 +692,7 @@ class Router(object):
mapper.connect(None, "/v1.0/{path_info:.*}", controller=BlogApp())
"""
self.map = mapper
self._router = routes.middleware.RoutesMiddleware(self._dispatch,
self.map)
self._router = middleware.RoutesMiddleware(self._dispatch, self.map)
@webob.dec.wsgify
def __call__(self, req):
@ -1102,6 +1100,6 @@ def paste_deploy_app(paste_config_file, app_name, conf):
"""
setup_paste_factories(conf)
try:
return deploy.loadapp("config:%s" % paste_config_file, name=app_name)
return loadwsgi.loadapp("config:%s" % paste_config_file, name=app_name)
finally:
teardown_paste_factories()