From bf7e992f702c40b2ec01cae32cb1ea27157b6cdc Mon Sep 17 00:00:00 2001 From: Lingchaox Xin Date: Mon, 1 Jul 2013 15:38:09 +0800 Subject: [PATCH] Pylint for job_request.py and cleanups Change-Id: Ia47b56ba66211374a4c3b145953155f45fdc54aa --- job_request.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/job_request.py b/job_request.py index 614e6a0..e4efcd5 100755 --- a/job_request.py +++ b/job_request.py @@ -18,7 +18,7 @@ import datetime # set default char-set endcoding to utf-8 reload(sys) -sys.setdefaultencoding('utf-8') +sys.setdefaultencoding('utf-8') # pylint: disable-msg=E1101 def request_url(request_id): """Get request url""" @@ -92,7 +92,7 @@ def obs_git_data(event_fields): try: key, value = line.split(':', 1) entry[mapping[key.strip()]] = value.strip() - except: + except AttributeError: print '-------------------------------------' print 'key:value %s' % line # FIXME: here is just a temp solution @@ -102,7 +102,8 @@ def obs_git_data(event_fields): entry.update(tag) else: print '-------------------------------------' - print "FATAL ERROR: Invalid rquest info: the request might be created by manual" + print "FATAL ERROR: Invalid rquest info: the request might be"\ + " created by manual" print '-------------------------------------' exit(0) desp_list.append(entry) @@ -161,16 +162,10 @@ def request_accepted(data, gerrit, gitprj): tag = data['GIT_TAG'].lower() - if tag.startswith('submit'): - try: - target_version = tag.split('/')[1] - except: - target_version = 'unknown' - else: - try: - target_version = tag.split('/')[1] - except: - target_version = 'unknown' + try: + target_version = tag.split('/')[1] + except AttributeError, IndexError: + target_version = 'unknown' timestamp = datetime.datetime.utcnow().strftime("%Y%m%d.%H%M%S") @@ -179,15 +174,16 @@ def request_accepted(data, gerrit, gitprj): gitprj.create_tag(accepted_tag, message, data['commitid']) - gitprj.push('ssh://%s@%s:%s/%s' %(gerrit.username, gerrit.host, gerrit.port, data['GIT_PROJECT']), - 'refs/tags/%s' %(accepted_tag)) + gitprj.push('ssh://%s@%s:%s/%s' %(gerrit.username, gerrit.host, \ + gerrit.port, data['GIT_PROJECT']), 'refs/tags/%s' %(accepted_tag)) def request_rejected(data, gerrit): """When request rejected, give msg to gerrit and delete remote package""" print '====request rejected====================================' - message = 'The SR (Submit Request) has been *rejected* to OBS %s project.\n' \ + message = 'The SR (Submit Request) has been *rejected* ' \ + 'to OBS %s project.\n' \ '- Reviewer: %s\n' \ '- Comments: %s\n' \ '- Git project: %s\n' \ @@ -219,7 +215,8 @@ def request_created(data): print '====request created====================================' - message = 'A SR (Submit Request) has been trigger to submit the commit to OBS %s project.\n' \ + message = 'A SR (Submit Request) has been trigger to submit the commit ' \ + 'to OBS %s project.\n' \ '- Submitter: %s\n' \ '- Comments: %s\n' \ '- Git project: %s\n' \ -- 2.7.4