From: José Fonseca Date: Sun, 11 Dec 2011 13:38:19 +0000 (+0000) Subject: Rely on jsondiff to strip comments. X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=commitdiff_plain;h=25dbf53f26766ce9ff3adea306cbd0996b45574a;hp=2a5b8c481348e3c6818612dfe71a34397604cdba Rely on jsondiff to strip comments. --- diff --git a/driver.py b/driver.py index e488e13..9894c9c 100755 --- a/driver.py +++ b/driver.py @@ -333,14 +333,10 @@ class TestCase: differ.visit(refState, srcState) fail('state from call %u does not match %s' % (callNo, refStateFileName)) - # Allo non-standard JS comments in JSON - json_comment_re = re.compile(r'//.*$', re.MULTILINE) - def getRefState(self, refStateFileName): - data = open(refStateFileName, 'rt').read() - data = self.json_comment_re.sub('', data) - state = json.loads(data, strict=False) - self.adjustRefState(state) + stream = open(refStateFileName, 'rt') + from jsondiff import load + state = load(stream) return state def getNamePrefix(self):