Use requests instead of urllib.urlretrieve for plugins

diff --git a/jenkinsapi_tests/systests/test_scm.py b/jenkinsapi_tests/systests/test_scm.py
index c5fcfb1acf1abf0d6326a8e90c5f782162b477aa..225c308fbb2e98fd829fc9ca3838776ec184c2db 100644 (file)
--- a/jenkinsapi_tests/systests/test_scm.py
+++ b/jenkinsapi_tests/systests/test_scm.py
@@ -22,8 +22,7 @@ class TestSCMGIT(BaseSystemTest):
         ii = job.invoke()
         ii.block(until='completed')
         self.assertFalse(ii.is_running())
-        bn = ii.get_build_number()
-        b = job.get_build(bn)
+        b = ii.get_build()
         self.assertIsInstance(b.get_revision(), basestring)
 
 if __name__ == '__main__':

diff --git a/jenkinsapi_utils/jenkins_launcher.py b/jenkinsapi_utils/jenkins_launcher.py
index 9c1a938bac5a116633cf7dbc6446a05f053b6223..4fffc723f67e4e06c678e17f1d52984493f491c1 100644 (file)
--- a/jenkinsapi_utils/jenkins_launcher.py
+++ b/jenkinsapi_utils/jenkins_launcher.py
@@ -1,6 +1,6 @@
 import os
 import time
-import urllib
+import requests
 import Queue
 import shutil
 import logging
@@ -80,7 +80,10 @@ class JenkinsLancher(object):
             log.info("Plugins will be installed in '%s'" % plugin_dir)
             # FIXME: This is kinda ugly but works
             filename = "plugin_%s.hpi" % i
-            urllib.urlretrieve(url, os.path.join(plugin_dir, filename))
+            plugin_path = os.path.join(plugin_dir, filename)
+            with open(plugin_path, 'wb') as h:
+                request = requests.get(url)
+                h.write(request.content)
         log.info("Restarting Jenkins after installing the plugins")
         self.jenkins_process.terminate()
         self.jenkins_process.wait()