From: Andrew Cooper Date: Sat, 6 Jan 2024 23:51:43 +0000 (+0000) Subject: runner: Remove the use of simplejson X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f908418919183309d02a51a471ded40b128bcba0;p=people%2Fandrewcoop%2Fxen-test-framework.git runner: Remove the use of simplejson This became part of the standard library in Python 2.6 Signed-off-by: Andrew Cooper --- diff --git a/xtf-runner b/xtf-runner index 94ed176..2d9b453 100755 --- a/xtf-runner +++ b/xtf-runner @@ -9,15 +9,12 @@ Currently assumes the presence and availability of the `xl` toolstack. from __future__ import print_function, unicode_literals +import json import sys, os, os.path as path from optparse import OptionParser from subprocess import Popen, PIPE, call as subproc_call -try: - import json -except ImportError: - import simplejson as json # Python 2/3 compatibility if sys.version_info >= (3, ):