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

diff --git a/jenkinsapi/config.py b/jenkinsapi/config.py
index 397e0d6aaba18fb4d24ee1b217df07d29951ea3c..fd541a6a14c2277e4898de125ca216e38b7e6a09 100644 (file)
--- 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 e50ce3931285be8dec556f88cd75344794f19e69..1b4facb3c169f350f717671e1c9764973e5e931a 100644 (file)
--- 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):