From 7a267dbf1671472580e31cd8366d3f1c679fb2aa Mon Sep 17 00:00:00 2001 From: ZhuoX Li Date: Fri, 4 Jul 2014 13:44:04 +0800 Subject: [PATCH] Use xml.sax module to solve the encode issue xml.sax module as a better substitute for the 'replace' property of string, to solve the encode issue. Change-Id: I167a217895536adfb58ecd9b320f510ecda5e9de --- job_request.py | 4 ++-- job_submit.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/job_request.py b/job_request.py index c6d7cce..a54676b 100755 --- a/job_request.py +++ b/job_request.py @@ -16,6 +16,7 @@ from gitbuildsys.errors import ObsError import sys import os import datetime +from xml.sax.saxutils import unescape # set default char-set endcoding to utf-8 reload(sys) @@ -96,8 +97,7 @@ def obs_git_data(event_fields): if not mkey: continue if key.strip() in ['Submitter']: - entry[mkey] = value.strip().replace('<', - '<').replace('>', '>') + entry[mkey] = unescape(value.strip()) else: entry[mkey] = value.strip() except (AttributeError, ValueError): diff --git a/job_submit.py b/job_submit.py index d25bdef..de83609 100755 --- a/job_submit.py +++ b/job_submit.py @@ -8,6 +8,7 @@ This job is triggered by Gerrit RefUpdate event. import os import sys import json +from xml.sax.saxutils import escape from gitbuildsys.errors import ObsError @@ -58,7 +59,7 @@ def create_project(git_url, git_project, git_tag, git_revision, build, 'git_commit': git_revision, 'images': []} if submitter: - info['submitter'] = submitter.replace('<', '<').replace('>', '>') + info['submitter'] = escape(submitter) if build.exists(obs_project): # update project info -- 2.7.4