From: Lingchaox Xin Date: Fri, 14 Jun 2013 01:09:28 +0000 (+0800) Subject: Pylint for common/buildservice.py and typo fixed X-Git-Tag: 0.14~138 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf9e8e41f593eab354585905dd752cb471b16ba1;p=services%2Fjenkins-scripts.git Pylint for common/buildservice.py and typo fixed Change-Id: I17568aec04f840765ea57146d838fbba2ad9073b --- diff --git a/common/buildservice.py b/common/buildservice.py index 8333c0d..4f740db 100644 --- a/common/buildservice.py +++ b/common/buildservice.py @@ -51,6 +51,9 @@ user=%(user)s passx=%(passwdx)s """ +class BuildServiceError(Exception): + """Local error handler""" + pass class BuildService(OSC): """Interface to Build Service API""" @@ -273,10 +276,13 @@ class BuildService(OSC): # the result, in unicode string return reqinfo - def get_request_list(self, dst_prj, dst_pkg, user='', req_type='submit', \ - req_state=['new','review']): + def get_request_list(self, dst_prj, dst_pkg, user='', req_type='', \ + req_state=()): """Get already existing request list to the same obs project """ + req_type = req_type or 'submit' + req_state = list(req_state) or ['new','review'] + if not user: user = conf.get_apiurl_usr(self.apiurl) return core.get_request_list(self.apiurl, dst_prj, dst_pkg, user, \ @@ -300,8 +306,8 @@ class BuildService(OSC): try: core.change_request_state(self.apiurl, reqid, 'declined', \ message=msg, supersed=None) - except Exception, err: - return str(err) + except BuildServiceError, bse: + return str(bse) return None @@ -313,8 +319,8 @@ class BuildService(OSC): try: core.change_request_state(self.apiurl, reqid, 'superseded', msg, \ supersed) - except Exception, err: - return str(err) + except BuildServiceError, bse: + return str(bse) return None @@ -401,8 +407,8 @@ class BuildService(OSC): package)) if root.attrib.has_key('project'): realprj = root.attrib['project'] - except Exception, exc: - print exc + except BuildServiceError, bse: + print bse realprj = '' return realprj @@ -416,7 +422,7 @@ class BuildService(OSC): try: core.delete_package(self.apiurl, project, package) - except Exception: + except BuildServiceError: return False return True @@ -515,8 +521,10 @@ class BuildService(OSC): return self.delete_project(obs_project, force=True, msg=msg) def get_arch(self, project, repo_name): + """Get arch though project and repo name""" + meta_xml = self.get_meta(project) - xml_root = ET.fromstringlist(meta_xml) + xml_root = ElementTree.fromstringlist(meta_xml) for repo_setting in xml_root.findall('repository'): if repo_setting.attrib['name'] == repo_name: return [node.text for node in repo_setting.findall('arch')]