From 40724ddb4678760704d7cb57dc5645811a2befb6 Mon Sep 17 00:00:00 2001 From: Hugh Brown Date: Thu, 10 Oct 2013 18:49:26 -0400 Subject: [PATCH] Modify over-long lines --- jenkinsapi/job.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jenkinsapi/job.py b/jenkinsapi/job.py index 9c5d9d2..fe5a614 100644 --- a/jenkinsapi/job.py +++ b/jenkinsapi/job.py @@ -23,6 +23,12 @@ from jenkinsapi.exceptions import ( UnknownQueueItem, ) +SVN_URL = './scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote' +GIT_URL = './scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url' +HG_URL = './scm/source' +GIT_BRANCH = './scm/branches/hudson.plugins.git.BranchSpec/name' +HG_BRANCH = './scm/branch' + log = logging.getLogger(__name__) @@ -45,15 +51,15 @@ class Job(JenkinsBase, MutableJenkinsThing): 'hudson.scm.NullSCM': 'NullSCM' } self._scmurlmap = { - 'svn': lambda element_tree: [element for element in element_tree.findall('./scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote')], - 'git': lambda element_tree: [element for element in element_tree.findall('./scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url')], - 'hg': lambda element_tree: [element_tree.find('./scm/source')], + 'svn': lambda element_tree: list(element_tree.findall(SVN_URL)), + 'git': lambda element_tree: list(element_tree.findall(GIT_URL)), + 'hg': lambda element_tree: list(element_tree.find(HG_URL)), None: lambda element_tree: [] } self._scmbranchmap = { 'svn': lambda element_tree: [], - 'git': lambda element_tree: [element for element in element_tree.findall('./scm/branches/hudson.plugins.git.BranchSpec/name')], - 'hg': lambda element_tree: [element_tree.find('./scm/branch')], + 'git': lambda element_tree: list(element_tree.findall(GIT_BRANCH)), + 'hg': lambda element_tree: list(element_tree.find(HG_BRANCH)), None: lambda element_tree: [] } JenkinsBase.__init__(self, url) -- 2.7.4