From b101711d0f6929f68228482b26aa2959ddd9b012 Mon Sep 17 00:00:00 2001 From: Igor Stoppa Date: Mon, 16 Jun 2014 13:50:43 +0300 Subject: [PATCH] Fix some trivial pylint issues * lines too long * missing docstrings * extra spaces Change-Id: I9345cfa2f0dceb61e9a5e52294d9ce776a24c2f2 --- common/utils.py | 19 +++++----- requests/mailer.py | 107 +++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 86 insertions(+), 40 deletions(-) diff --git a/common/utils.py b/common/utils.py index 051e204..5cbc10a 100644 --- a/common/utils.py +++ b/common/utils.py @@ -55,15 +55,13 @@ def retry(retries=3): """This will try to execute one function 3 times(by default) until \ success.""" def deco_retry(func): - """decorator function - """ + """Function wrapper""" def f_retry(*args): - """excecute 3 times, success return True ,otherwise False - """ + """Retry Loop""" retry_count = retries - f_func = func(*args) + retval = func(*args) while retry_count > 0: - if f_func == True: + if retval == True: return True else: print '%s failed, retrying...' % func.func_name @@ -125,7 +123,8 @@ def sync(source, destination, remove=True): try: ret_code = subprocess.call(cmd, shell = True) except OSError as err: - raise RuntimeException("Execution of %s failed: %s" % (cmd, str(err))) + raise RuntimeException("Execution of %s failed: %s" % + (cmd, str(err))) # Through ssh protocol elif destination.startswith('ssh:'): @@ -135,7 +134,8 @@ def sync(source, destination, remove=True): try: ret_code = subprocess.call(cmd, shell = True) except OSError as err: - raise RuntimeException("Execution of %s failed: %s" % (cmd, str(err))) + raise RuntimeException("Execution of %s failed: %s" % + (cmd, str(err))) # Try to take the destination as local path else: @@ -213,7 +213,8 @@ def xml2obj(src): items = sorted(self._attrs.items()) if self.data: items.append(('data', self.data)) - return u'{%s}' % ', '.join([u'%s:%s' % (k, repr(v)) for k, v in items]) + return u'{%s}' % ', '.join([u'%s:%s' % (k, repr(v)) + for k, v in items]) class TreeBuilder(xml.sax.handler.ContentHandler): """A wrapper class of ContentHandler""" diff --git a/requests/mailer.py b/requests/mailer.py index 1e4c56b..0c3cef6 100644 --- a/requests/mailer.py +++ b/requests/mailer.py @@ -44,8 +44,11 @@ MAIL_TRIGGERS = { ( { 'temp': 'obs_request_delpkg', - 'cond': lambda bs, req: req.get('deleteproject') and req.get('deletepackage'), - 'sub': '${reqid}: Remove package ${deleteproject}/${deletepackage}', + 'cond': lambda bs, req: + req.get('deleteproject') and + req.get('deletepackage'), + 'sub': '${reqid}: Remove package ' + '${deleteproject}/${deletepackage}', 'to': ['mailinglist'], 'cc': [], 'from': 'who', @@ -55,34 +58,44 @@ MAIL_TRIGGERS = { }, { 'temp': 'obs_request_changedevel', - 'cond': lambda bs, req: req.get('origintype') == 'change_devel', - 'sub': '${reqid}: Change devel of ${targetproject}/${targetpackage} to ${sourceproject}/${sourcepackage}', + 'cond': lambda bs, req: + req.get('origintype') == 'change_devel', + 'sub': '${reqid}: Change devel of ' + '${targetproject}/${targetpackage} to ' + '${sourceproject}/${sourcepackage}', 'to': ['mailinglist'], 'cc': [], 'from': 'who', - 'fields':['description', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['description', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':False, 'tgtprj': 'targetproject', }, { 'temp': 'obs_request_newpkg', - 'cond': lambda bs, req: not bs.exists(req['targetproject'], req['targetpackage']), - 'sub': '${reqid}: New package ${targetproject}/${targetpackage}', + 'cond': lambda bs, req: + not bs.exists(req['targetproject'], + req['targetpackage']), + 'sub': '${reqid}: New package ' + '${targetproject}/${targetpackage}', 'to': ['mailinglist'], 'cc': [], 'from': 'who', - 'fields':['description', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['description', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':True, 'tgtprj': 'targetproject', }, { 'temp': 'obs_request_create', 'cond': None, - 'sub': '${reqid}: Changes to ${targetproject}/${targetpackage}', + 'sub': '${reqid}: Changes to ' + '${targetproject}/${targetpackage}', 'to': ['mailinglist'], 'cc': [], 'from': 'who', - 'fields':['description', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['description', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':True, 'tgtprj': 'targetproject', }, @@ -91,19 +104,25 @@ MAIL_TRIGGERS = { ( { 'temp': 'obs_request_changedevel_accept', - 'cond': lambda bs, req: req['state'] == 'accepted' and req.get('origintype') == 'change_devel', - 'sub': '${reqid} accepted: ${sourceproject}/${sourcepackage} is devel of ${targetproject}/${targetpackage}', + 'cond': lambda bs, req: + req['state'] == 'accepted' and + req.get('origintype') == 'change_devel', + 'sub': '${reqid} accepted: ' + '${sourceproject}/${sourcepackage} is devel of ' + '${targetproject}/${targetpackage}', 'to': ['mailinglist'], 'cc': [], 'from': 'sender', - 'fields':['comment', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['comment', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':False, 'tgtprj': 'targetproject', }, { 'temp': 'obs_request_accept', 'cond': lambda bs, req: req['state'] == 'accepted', - 'sub': '${reqid} accepted: ${targetproject}/${targetpackage}', + 'sub': '${reqid} accepted: ' + '${targetproject}/${targetpackage}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'sender', @@ -115,9 +134,13 @@ MAIL_TRIGGERS = { 'OBS_SRCSRV_REQUEST_STATECHANGE': ( { - 'cond': lambda bs, req: req['state'] == 'declined' and req.get('deleteproject') and req.get('deletepackage'), + 'cond': lambda bs, req: + req['state'] == 'declined' and + req.get('deleteproject') and + req.get('deletepackage'), 'temp': 'obs_request_delpkg_decline', - 'sub': '${reqid} declined: Request to delete ${deleteproject}/${deletepackge}', + 'sub': '${reqid} declined: Request to delete ' + '${deleteproject}/${deletepackge}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'sender', @@ -126,42 +149,59 @@ MAIL_TRIGGERS = { 'tgtprj': 'deleteproject', }, { - 'cond': lambda bs, req: req['state'] == 'declined' and req.get('origintype') == 'change_devel', + 'cond': lambda bs, req: + req['state'] == 'declined' and + req.get('origintype') == 'change_devel', 'temp': 'obs_request_changedevel_decline', - 'sub': '${reqid} declined: ${sourceproject}/${sourcepackage} as devel of ${targetproject}/${targetpackage}', + 'sub': '${reqid} declined: ' + '${sourceproject}/${sourcepackage} as devel of ' + '${targetproject}/${targetpackage}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'sender', - 'fields':['comment', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['comment', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':False, 'tgtprj': 'targetproject', }, { - 'cond': lambda bs, req: req['state'] == 'declined' and req['comment'] == AUTO_REJECT_COMMENT, + 'cond': lambda bs, req: + req['state'] == 'declined' and + req['comment'] == AUTO_REJECT_COMMENT, 'temp': 'obs_request_auto_reject', - 'sub': '${reqid} auto rejected: ${sourceproject}/${sourcepackage} to ${targetproject}/${targetpackage}', + 'sub': '${reqid} auto rejected: ' + '${sourceproject}/${sourcepackage} to ' + '${targetproject}/${targetpackage}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'sender', - 'fields':['comment', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['comment', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':False, 'tgtprj': 'targetproject', }, { 'cond': lambda bs, req: req['state'] == 'declined', 'temp': 'obs_request_decline', - 'sub': '${reqid} declined: ${sourceproject}/${sourcepackage} to ${targetproject}/${targetpackage}', + 'sub': '${reqid} declined: ' + '${sourceproject}/${sourcepackage} to ' + '${targetproject}/${targetpackage}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'sender', - 'fields':['comment', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['comment', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':False, 'tgtprj': 'targetproject', }, { - 'cond': lambda bs, req: req['state'] == 'revoked' and req.get('deleteproject') and req.get('deletepackage'), + 'cond': lambda bs, req: + req['state'] == 'revoked' and + req.get('deleteproject') and + req.get('deletepackage'), 'temp': 'obs_request_delpkg_revoke', - 'sub': '${reqid} revoked: Request to delete ${deleteproject}/${deletepackage}', + 'sub': '${reqid} revoked: Request to delete ' + '${deleteproject}/${deletepackage}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'who', @@ -170,20 +210,25 @@ MAIL_TRIGGERS = { 'tgtprj': 'deleteproject', }, { - 'cond': lambda bs, req: req['state'] == 'revoked' and req.get('origintype') == 'change_devel', + 'cond': lambda bs, req: + req['state'] == 'revoked' and + req.get('origintype') == 'change_devel', 'temp': 'obs_request_changedevel_revoke', - 'sub': '${reqid} revoked: Change devel of ${targetproject}/${targetpackage}', + 'sub': '${reqid} revoked: Change devel of ' + '${targetproject}/${targetpackage}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'who', - 'fields':['comment', 'targetproject', 'targetpackage', 'sourceproject', 'sourcepackage'], + 'fields':['comment', 'targetproject', 'targetpackage', + 'sourceproject', 'sourcepackage'], 'detail?':False, 'tgtprj': 'targetproject', }, { 'cond': lambda bs, req: req['state'] == 'revoked', 'temp': 'obs_request_revoke', - 'sub': '${reqid} revoked: Changes to ${targetproject}/${targetpackage}', + 'sub': '${reqid} revoked: Changes to ' + '${targetproject}/${targetpackage}', 'to': ['GIT_AUTHOR_EMAIL'], 'cc': ['mailinglist'], 'from': 'who', @@ -306,7 +351,7 @@ def mailer(request, _bs, request_data, sr_enabled_users=None, \ msg = [] try: from Cheetah.Template import Template - template = Template(template_str, searchList = return_dict) + template = Template(template_str, searchList=return_dict) template.msg = "\n".join(msg) body = str(template) except ImportError: -- 2.7.4