a5bfe4f00f
The only use of FrozenJob.toDict is to compare a previously frozen job to a not-yet frozen job to see if the configuration has changed; this is why toDict is on the AbstractJob -- both kinds of jobs need to return the same info in toDict for this comparison. If, instead, we calculate a hash on the config Job and then also store that hash on the frozen job, we can compare the two without needing the full toDict method on the frozen job. This simplifies the frozen job considerably (as it no longer needs to have all of its children in object form just for the purposes of this comparison). This leaves us with no commonality in AbstractJob, so it is now removed. Change-Id: Idf4c97baf041a40e90acfcc38f39b4d7836d3b4f
36 lines
1.1 KiB
Python
36 lines
1.1 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.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.model.ZuulMark)):
|
|
return {}
|
|
return json.JSONEncoder.default(self, o)
|
|
|
|
|
|
def json_dumps(obj, **kw):
|
|
return json.dumps(obj, cls=ZuulJSONEncoder, **kw)
|