mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-09 13:49:24 +08:00
6f43411ea9
This fixes issues with calling 'python module_build_service/manage.py' directly from the MBS git repo as part of testing local module builds without installing MBS. The issue is that 'import pkg_resources' for some reason tries to load module_build_service.backports before the module_build_service.app actually exists. This results in traceback saying that module_build_service.app does not exist. This commit fixes this by importing whole module_build_service in backports.py.
57 lines
2.3 KiB
Python
57 lines
2.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright (c) 2018 Red Hat, Inc.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
# of this software and associated documentation files (the "Software"), to deal
|
|
# in the Software without restriction, including without limitation the rights
|
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the Software is
|
|
# furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in all
|
|
# copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
# SOFTWARE.
|
|
#
|
|
# Written by Jan Kaluza <jkaluza@redhat.com>
|
|
|
|
from flask.json import dumps
|
|
from flask import request
|
|
|
|
import module_build_service
|
|
|
|
|
|
def jsonify(*args, **kwargs):
|
|
# This is `flask.jsonify` version which supports Python list as an input.
|
|
# We cannot use real `jsonify`, because it can handle Python lists as
|
|
# input only since 0.11, but RHEL7 contains 0.10.1.
|
|
# https://github.com/pallets/flask/commit/daceb3e3a028b4b408c4bbdbdef0047f1de3a7c9
|
|
indent = None
|
|
separators = (',', ':')
|
|
|
|
if module_build_service.app.config['JSONIFY_PRETTYPRINT_REGULAR'] and not request.is_xhr:
|
|
indent = 2
|
|
separators = (', ', ': ')
|
|
|
|
if args and kwargs:
|
|
raise TypeError("jsonify() behavior undefined when passed both args and kwargs")
|
|
elif len(args) == 1: # single args are passed directly to dumps()
|
|
data = args[0]
|
|
elif args: # convert multiple args into an array
|
|
data = list(args)
|
|
else: # convert kwargs to a dict
|
|
data = dict(kwargs)
|
|
|
|
# Note that we add '\n' to end of response
|
|
# (see https://github.com/mitsuhiko/flask/pull/1262)
|
|
rv = module_build_service.app.response_class(
|
|
(dumps(data, indent=indent, separators=separators), '\n'),
|
|
mimetype='application/json')
|
|
return rv
|