From 110ca8041e118b05846b7356ebba600f9a2ca34e Mon Sep 17 00:00:00 2001 From: Lingchaox Xin Date: Wed, 3 Jul 2013 16:18:47 +0800 Subject: [PATCH] Do NOT keep json backwards compatibility with Python 2.5 Change-Id: Ieb0e96aa79a9a3b2e91eb27ad269a2b8479f632c --- common/buildtrigger.py | 5 +---- job_obsevent_dispatcher.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common/buildtrigger.py b/common/buildtrigger.py index 7c60e62..8fc4cfa 100644 --- a/common/buildtrigger.py +++ b/common/buildtrigger.py @@ -1,10 +1,7 @@ """A build trigger""" import base64 -try: - import json -except ImportError: - import simplejson as json +import json from common.utils import unicode_to_str diff --git a/job_obsevent_dispatcher.py b/job_obsevent_dispatcher.py index 0dd4a59..96540ac 100755 --- a/job_obsevent_dispatcher.py +++ b/job_obsevent_dispatcher.py @@ -11,10 +11,7 @@ reload(sys) sys.setdefaultencoding('utf-8') # pylint: enable-msg=E1101 -try: - import json -except ImportError: - import simplejson as json +import json from common.buildtrigger import trigger_next -- 2.7.4