openstack/deb-zaqar
Code Issues Proposed changes

Fix falcon confilct in requirements.txt

Browse Source 
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.

Closes-Bug: #1583358

Change-Id: Ie182017d982efd727c63634b2a168dadd41711e4
This commit is contained in:
wanghao 2016-05-19 17:20:36 +08:00 committed by Fei Long Wang
parent 58e8429e0f
commit e6d975fd10
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from distutils.version import LooseVersion
from wsgiref import simple_server
import falcon
@ -115,8 +116,17 @@ class Driver(transport.DriverBase):
('/v1.1', v1_1.private_endpoints(self, self._conf)),
('/v2', v2_0.private_endpoints(self, self._conf)),
])
middleware = [FuncMiddleware(hook) for hook in self.before_hooks]
self.app = falcon.API(middleware=middleware)
# 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 LooseVersion(falcon.__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)
self.app.add_error_handler(Exception, self._error_handler)
for version_path, endpoints in catalog: