Tristan Cacqueray
7af096761f
In certain situation (e.g. when a job in a project template defines a variable named 'job' while the job already has a variable named 'job'), the JSONEncoder fail with this exception: File "zuul/lib/jsonutil.py", line 26, in default return json.JSONEncoder.default(self, o) File "json/encoder.py", line 180, in default raise TypeError(repr(o) + " is not JSON serializable") TypeError: <zuul.configloader.ZuulMark object at 0xA> is not JSON serializable Change-Id: Icb6490bc1b3ce4b7f326b07eb9871f9d2b3b605a
37 lines
1.2 KiB
Python
37 lines
1.2 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import json
|
|
import types
|
|
|
|
import zuul.configloader
|
|
import zuul.model
|
|
|
|
|
|
class ZuulJSONEncoder(json.JSONEncoder):
|
|
def default(self, o):
|
|
if isinstance(o, types.MappingProxyType):
|
|
d = dict(o)
|
|
# Always remove SafeLoader left-over
|
|
d.pop('_source_context', None)
|
|
d.pop('_start_mark', None)
|
|
return d
|
|
elif (
|
|
isinstance(o, zuul.model.SourceContext) or
|
|
isinstance(o, zuul.configloader.ZuulMark)):
|
|
return {}
|
|
return json.JSONEncoder.default(self, o)
|
|
|
|
|
|
def json_dumps(obj):
|
|
return json.dumps(obj, cls=ZuulJSONEncoder)
|