From: Victor García <victor@tuenti.com>
Date: Thu, 12 Sep 2013 16:35:43 +0000 (+0200)
Subject: fixing queue url format, the api/python part was duplicated
X-Git-Tag: v0.2.23~97^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41ebd416f5f8bc501bdb9178ca7351e41fd29ae4;p=tools%2Fpython-jenkinsapi.git

fixing queue url format, the api/python part was duplicated
---

diff --git a/jenkinsapi/config.py b/jenkinsapi/config.py
index 397e0d6..fd541a6 100644
--- a/jenkinsapi/config.py
+++ b/jenkinsapi/config.py
@@ -1,2 +1,2 @@
-JENKINS_API = r"api/python/"
+JENKINS_API = r"api/python"
 LOAD_TIMEOUT = 30
diff --git a/jenkinsapi/jenkins.py b/jenkinsapi/jenkins.py
index e50ce39..1b4facb 100644
--- a/jenkinsapi/jenkins.py
+++ b/jenkinsapi/jenkins.py
@@ -1,6 +1,7 @@
 import json
 import urllib
 import logging
+import urlparse
 
 from jenkinsapi import config
 from jenkinsapi.job import Job
@@ -240,11 +241,11 @@ class Jenkins(JenkinsBase):
 
     def get_node_url(self, nodename=""):
         """Return the url for nodes"""
-        url = "%(baseurl)s/computer/%(nodename)s" % {'baseurl': self.baseurl, 'nodename': urllib.quote(nodename)}
+        url = urlparse.urljoin(self.base_server_url(), 'computer/%s' % urllib.quote(nodename))
         return url
 
     def get_queue_url(self):
-        url = "%(baseurl)s/queue/" % {'baseurl': self.baseurl}
+        url = urlparse.urljoin(self.base_server_url(), 'queue')
         return url
 
     def get_queue(self):