Merge lp:~cjohnston/uci-engine/cli-requests into lp:uci-engine

[Chris Johnston]

Switch the CLI to use python-requests

Swiftclient is already using python-requests, and I think that using python-requests will make working with the gatekeeper easier so lets switch to using it for the CLI.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:499
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cjohnston/uci-engine/cli-requests/+merge/220960/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/701/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/701/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:499
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/703/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/703/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

nothing major, but 3 comments

[lp:~cjohnston/uci-engine/cli-requests]

500. By Chris Johnston on 2014-05-27

Remove double code block for exceptions

501. By Chris Johnston on 2014-05-27

Update test to call ConnectionError on socket.error

502. By Chris Johnston on 2014-05-27

More cleanup

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:502
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/706/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/706/rebuild

review: Approve (continuous-integration)

=== modified file 'cli/ci_cli/image.py'
--- cli/ci_cli/image.py	2014-05-07 14:56:11 +0000
+++ cli/ci_cli/image.py	2014-05-27 09:44:30 +0000
@@ -15,7 +15,8 @@
 
 import os
 import sys
-import urllib2
+
+from requests import exceptions
 
 from ci_cli import utils
 from ci_utils import (
@@ -41,11 +42,11 @@
         url = artifact_base + '?type__exact=IMAGE&ticket__exact={}'.format(
             ticket)
         return utils.get(url)
-    except urllib2.HTTPError, exc:
-        if exc.code == 404 and ticket:
+    except exceptions.HTTPError, exc:
+        if exc.response.status_code == 404 and ticket:
             sys.exit("Ticket number {} not found.".format(ticket))
         raise
-    except urllib2.URLError, exc:
+    except exceptions.ConnectionError, exc:
         raise
 
 

=== modified file 'cli/ci_cli/status.py'
--- cli/ci_cli/status.py	2014-05-07 14:56:11 +0000
+++ cli/ci_cli/status.py	2014-05-27 09:44:30 +0000
@@ -14,7 +14,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-import urllib2
+
+from requests import exceptions
 
 from ci_cli import utils
 
@@ -27,11 +28,11 @@
         else:
             url = utils.CI_URL + utils.TICKET_BASE
             data = utils.get(url)
-    except urllib2.HTTPError, exc:
-        if exc.code == 404 and args.ticket:
+    except exceptions.HTTPError, exc:
+        if exc.response.status_code == 404 and args.ticket:
             sys.exit("Ticket number {} not found.".format(args.ticket))
         raise
-    except urllib2.URLError, exc:
+    except exceptions.ConnectionError, exc:
         raise
 
     if args.ticket:

=== modified file 'cli/ci_cli/tests/__init__.py'
--- cli/ci_cli/tests/__init__.py	2014-05-07 17:57:12 +0000
+++ cli/ci_cli/tests/__init__.py	2014-05-27 09:44:30 +0000
@@ -17,10 +17,13 @@
 import imp
 import os
 import sys
+import json
 
 from cStringIO import StringIO
 from contextlib import contextmanager
 
+from requests import exceptions
+
 from ci_cli import utils
 from ci_utils.testing import TestCaseWithGnupg
 
@@ -54,6 +57,46 @@
     utils.CI_URL = utils.AUTH_CONFIG['ci_url']
 
 
+class FakeRequestsReturn:
+    """Object to mock the return of python-requests return."""
+
+    def __init__(self, code, content, reason=None):
+        self.status_code = code
+        self.content = content
+        self.reason = reason
+
+    def raise_for_status(self):
+        if 400 == self.status_code:
+            error = '%s Client Error: %s' % (self.status_code, self.reason)
+            e = exceptions.ConnectionError(error)
+            raise e
+        elif 400 < self.status_code < 500:
+            error = '%s Client Error: %s' % (self.status_code, self.reason)
+            e = exceptions.HTTPError(error, response=self)
+            raise e
+        elif 500 <= self.status_code < 600:
+            error = '%s Server Error: %s' % (self.status_code, self.reason)
+            e = exceptions.HTTPError(error, response=self)
+            raise e
+        else:
+            pass
+
+    def __repr__(self):
+        return self.content
+
+    def __iter__(self):
+        return (line for line in self.content.split("\n"))
+
+    def read(self):
+        return self.content
+
+    def json(self):
+        return json.loads(self.content)
+
+    def _status_code(self):
+        pass
+
+
 class MainScriptTestCase(TestCaseWithGnupg):
     """Load the 'ubuntu-ci' script module for tests.
 

=== modified file 'cli/ci_cli/tests/test_cli.py'
--- cli/ci_cli/tests/test_cli.py	2014-05-12 15:49:28 +0000
+++ cli/ci_cli/tests/test_cli.py	2014-05-27 09:44:30 +0000
@@ -21,7 +21,6 @@
 import mock
 import socket
 from testfixtures import LogCapture
-import urllib2
 
 from ci_cli import utils
 from ci_cli.tests import (
@@ -29,6 +28,7 @@
     capture_stdout,
     mock_load_config,
     MainScriptTestCase,
+    FakeRequestsReturn,
 )
 from ci_cli.ticket import new_ticket
 from ci_utils.testing import get_test_file_path
@@ -41,9 +41,10 @@
 class CLICommandsTestCase(MainScriptTestCase):
     """Tests cli basic commands."""
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_cli.utils.load_config', side_effect=mock_load_config())
-    def test_ticket_status_one_ticket(self, mock_load_config, mock_urlopen):
+    def test_ticket_status_one_ticket(self, mock_load_config,
+                                      mock_requests):
         """Verify cli status command when providing ticket number."""
         data = {
             "current_workflow_step": str(TicketWorkflowStep.IMAGE_BUILDING),
@@ -58,9 +59,9 @@
             "added_binaries": "mynewpackage",
             "removed_binaries": "myoldpackage",
         }
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         args = ['status', '-t', '5']
         with capture_stdout(self.cli.main, args) as cm:
             self.assertEquals(
@@ -76,11 +77,11 @@
                 'Removed binaries: myoldpackage\n'.format(
                     str(TicketWorkflowStep.IMAGE_BUILDING),
                     str(TicketWorkflowStepStatus.INPROGRESS)))
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_cli.utils.load_config', side_effect=mock_load_config())
-    def test_ticket_status_all_tickets(self, mock_load_config, mock_urlopen):
+    def test_ticket_status_all_tickets(self, mock_load_config, mock_requests):
         """Verify cli status command for multiple tickets."""
         data = {
             "objects": [
@@ -98,16 +99,16 @@
                 },
             ]
         }
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         args = ['status']
         with capture_stdout(self.cli.main, args) as cm:
             self.assertEquals(
                 cm,
                 "Ticket #5, My cool feature is 100 110\n" +
                 "Ticket #6, Ubuntu bug fix is 100 110\n")
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
 
     @mock.patch('ci_cli.ticket.SubTicket._process')
     @mock.patch('ci_cli.utils.post',
@@ -154,83 +155,94 @@
         self.assertTrue("foobar" in new_ticket_.subtickets)
         self.assertTrue("barfoo" in new_ticket_.subtickets)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_cli.utils.load_config', side_effect=mock_load_config())
-    def test_ts_server_returns_urlerror(self, mock_load_config, mock_urlopen):
+    def test_ts_server_returns_urlerror(self, mock_load_config, mock_requests):
         """Test cli response to ts server refusing connection (111)."""
-        mock_urlopen.side_effect = urllib2.URLError(reason=socket.error(111,
-                                                    "Connection refused"))
+        mock_requests.side_effect = [
+            FakeRequestsReturn(
+                400, '', socket.error(111, "Connection refused"))
+        ]
         args = ['status']
         with LogCapture() as lc:
             logger = logging.getLogger()
             self.cli.main(args, log=logger)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
         self.assertTrue("Cannot reach the server at %s." % utils.CI_URL in
+                        lc.records[0].msg, lc.records[0].msg)
+        self.assertTrue("Connection refused" in lc.records[0].msg,
                         lc.records[0].msg)
-        self.assertTrue("Connection refused" in lc.records[0].msg)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_cli.utils.load_config', side_effect=mock_load_config())
     def test_ts_server_returns_internal_server_error(self, mock_load_config,
-                                                     mock_urlopen):
+                                                     mock_requests):
         """Test cli response to ts server returning error 500."""
-        mock_urlopen.side_effect = urllib2.HTTPError(None, 500,
-                                                     "INTERNAL SERVER ERROR",
-                                                     None, None)
+        mock_requests.side_effect = [
+            FakeRequestsReturn(
+                500, "", "INTERNAL SERVER ERROR"
+            )
+        ]
         args = ['status']
         with LogCapture() as lc:
             logger = logging.getLogger()
             self.cli.main(args, log=logger)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
         self.assertEquals("Server at {} reported internal error. Maybe a "
                           "database hiccup?".format(utils.CI_URL),
                           lc.records[0].msg)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_cli.utils.load_config', side_effect=mock_load_config())
     def test_ts_server_returns_url_not_found(self, mock_load_config,
-                                             mock_urlopen):
+                                             mock_requests):
         """Test cli response to ts server returning 404 error."""
-        mock_urlopen.side_effect = urllib2.HTTPError(None, 404,
-                                                     "Server Not Found",
-                                                     None, None)
+        mock_requests.side_effect = [
+            FakeRequestsReturn(404, '', 'Not Found')
+        ]
         args = ['status']
         with LogCapture() as lc:
             logger = logging.getLogger()
             self.cli.main(args, log=logger)
-        mock_urlopen.assert_called_once()
-        self.assertEquals("Server at {} not found. Is 'ci_url' correctly "
-                          "set? (HTTP Error 404: Server Not Found)".format(
-                              utils.CI_URL), lc.records[0].msg)
+            mock_requests.assert_called_once()
+            self.assertEquals("Server at {} not found. Is 'ci_url' correctly "
+                              "set? (404 Client Error: Not Found)".format(
+                                  utils.CI_URL), lc.records[0].msg)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_cli.utils.load_config', side_effect=mock_load_config())
     def test_ts_server_returns_bad_status_line(self, mock_load_config,
-                                               mock_urlopen):
+                                               mock_requests):
         """Test cli response to ts server returning BadStatusLine."""
         args = ['status']
-        mock_urlopen.side_effect = httplib.BadStatusLine('')
+        mock_requests.side_effect = httplib.BadStatusLine('')
         with LogCapture() as lc:
             logger = logging.getLogger()
             self.cli.main(args, log=logger)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
         self.assertEquals("Server at {} replied with an empty response. Is "
                           "'ci_url' pointing to the correct service?".format(
                               utils.CI_URL), lc.records[0].msg)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_cli.utils.load_config', side_effect=mock_load_config())
     def test_ts_server_returns_other_httperror(self, mock_load_config,
-                                               mock_urlopen):
+                                               mock_requests):
         """Test cli response to ts server returning HTTPError."""
-        mock_urlopen.side_effect = urllib2.HTTPError(None, 403, "Forbidden",
-                                                     None, None)
+        mock_requests.side_effect = [
+            FakeRequestsReturn(403, '', 'Forbidden')
+        ]
         args = ['status']
         with LogCapture() as lc:
             logger = logging.getLogger()
             self.cli.main(args, log=logger)
-        mock_urlopen.assert_called_once()
-        self.assertEquals("HTTP Error 403: Forbidden", lc.records[0].msg)
+        mock_requests.assert_called_once()
+        self.assertEquals(
+            "Cannot reach the server at {}. Please, check your "
+            "configuration file ({}): is 'ci_url' correctly set? "
+            "Is the server up and reachable from this machine? "
+            "(403 Client Error: Forbidden).".format(
+                utils.CI_URL, utils.DEF_CFG), lc.records[0].msg)
 
 
 class CliArgumentsTestCase(MainScriptTestCase):

=== modified file 'cli/ci_cli/tests/test_get_ticket_status.py'
--- cli/ci_cli/tests/test_get_ticket_status.py	2014-05-12 15:49:28 +0000
+++ cli/ci_cli/tests/test_get_ticket_status.py	2014-05-27 09:44:30 +0000
@@ -17,11 +17,11 @@
 
 import mock
 import json
-import urllib2
 
 from ci_cli.tests import (
     capture_stdout,
     MainScriptTestCase,
+    FakeRequestsReturn,
 )
 from ci_utils.ticket_states import (
     TicketWorkflowStep,
@@ -31,8 +31,8 @@
 
 class GetTicketStatus(MainScriptTestCase):
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_single_ticket_status(self, mock_urlopen):
+    @mock.patch('requests.get')
+    def test_get_single_ticket_status(self, mock_requests):
         data = {
             "current_workflow_step": str(TicketWorkflowStep.IMAGE_BUILDING),
             "status": str(TicketWorkflowStepStatus.INPROGRESS),
@@ -46,9 +46,9 @@
             "added_binaries": "mynewpackage",
             "removed_binaries": "myoldpackage",
         }
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         args = self.cli.parse_arguments(['status', '-t', '100'])
         with capture_stdout(args.func, args) as cm:
             self.assertEqual(
@@ -64,10 +64,10 @@
                     str(TicketWorkflowStep.IMAGE_BUILDING),
                     str(TicketWorkflowStepStatus.INPROGRESS)),
                 cm)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_ticket_status_unicode(self, mock_urlopen):
+    @mock.patch('requests.get')
+    def test_get_ticket_status_unicode(self, mock_requests):
         data = {
             "current_workflow_step": str(TicketWorkflowStep.IMAGE_BUILDING),
             "status": str(TicketWorkflowStepStatus.INPROGRESS),
@@ -81,9 +81,9 @@
             "added_binaries": "mynewpackage",
             "removed_binaries": "myoldpackage",
         }
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         args = self.cli.parse_arguments(['status', '-t', '100'])
         with capture_stdout(args.func, args) as cm:
             self.assertEqual(
@@ -99,10 +99,10 @@
                     str(TicketWorkflowStep.IMAGE_BUILDING),
                     str(TicketWorkflowStepStatus.INPROGRESS)),
                 cm)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_single_failed_ticket_status(self, mock_urlopen):
+    @mock.patch('requests.get')
+    def test_get_single_failed_ticket_status(self, mock_requests):
         data = {
             "current_workflow_step": str(TicketWorkflowStep.FAILED),
             "status": str(TicketWorkflowStepStatus.FAILED),
@@ -116,9 +116,9 @@
             "added_binaries": "mynewpackage",
             "removed_binaries": "myoldpackage",
         }
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         args = self.cli.parse_arguments(['status', '-t', '100'])
         with capture_stdout(args.func, args) as cm:
             self.assertEqual(
@@ -133,10 +133,10 @@
                 'Removed binaries: myoldpackage\n'.format(
                     str(TicketWorkflowStepStatus.FAILED)),
                 cm)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_all_ticket_status(self, mock_urlopen):
+    @mock.patch('requests.get')
+    def test_get_all_ticket_status(self, mock_requests):
         data = {
             "objects": [
                 {
@@ -165,9 +165,9 @@
                 },
             ]
         }
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         args = self.cli.parse_arguments(['status'])
         with capture_stdout(args.func, args) as cm:
             self.assertEqual(
@@ -176,15 +176,15 @@
                 "Ticket #7, Upstream bug fix is 100 110\n" +
                 "Ticket #9, Other new feature is 100 110\n",
                 cm)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_status_404_response(self, mock_urlopen):
-        mock_urlopen.side_effect = urllib2.HTTPError("http://example.com",
-                                                     404, "Not Found", "",
-                                                     None)
+    @mock.patch('requests.get')
+    def test_get_status_404_response(self, mock_requests):
+        mock_requests.side_effect = [
+            FakeRequestsReturn(404, '', 'Not Found')
+        ]
         args = self.cli.parse_arguments(['status', '-t', '99'])
         with self.assertRaises(SystemExit) as cm:
             args.func(args)
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
         self.assertEqual("Ticket number 99 not found.", cm.exception.message)

=== modified file 'cli/ci_cli/tests/test_image.py'
--- cli/ci_cli/tests/test_image.py	2014-05-07 14:56:11 +0000
+++ cli/ci_cli/tests/test_image.py	2014-05-27 09:44:30 +0000
@@ -26,26 +26,10 @@
 from ci_cli.tests import (
     capture_stdout,
     MainScriptTestCase,
+    FakeRequestsReturn,
 )
 
 
-class FakeUrlOpenReturn:
-    """Object to mock the return of urllib2.urlopen."""
-
-    def __init__(self, code, content):
-        self.code = code
-        self.content = content
-
-    def __repr__(self):
-        return self.content
-
-    def __iter__(self):
-        return (line for line in self.content.split("\n"))
-
-    def read(self):
-        return self.content
-
-
 artifact_data = {
     "objects": [
         {
@@ -88,11 +72,11 @@
         if os.path.exists(self.image_path):
             os.remove(self.image_path)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_utils.data_store.create_for_ticket')
-    def test_get_ticket_image(self, mock_create_datastore, mock_urlopen):
-        mock_urlopen.side_effect = [
-            FakeUrlOpenReturn(200, json.dumps(artifact_data))]
+    def test_get_ticket_image(self, mock_create_datastore, mock_requests):
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(artifact_data))]
         mock_datastore = mock.Mock()
         mock_datastore.get_file.return_value = buffer(" ")
         mock_create_datastore.return_value = mock_datastore
@@ -106,12 +90,12 @@
                 "Image file can be found at: {}\n".format(self.image_path))
         mock_datastore.assert_called_once()
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_utils.data_store.create_for_ticket')
     def test_get_ticket_image_not_found(self, mock_create_datastore,
-                                        mock_urlopen):
-        mock_urlopen.side_effect = [
-            FakeUrlOpenReturn(200, json.dumps(artifact_data))]
+                                        mock_requests):
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(artifact_data))]
         mock_datastore = mock.Mock()
         mock_datastore.get_file.side_effect = data_store.DataStoreException(
             "Failed to get file: d62d3d9a-ac3d-11e3-847d-fa163eaf5928.img, "
@@ -125,12 +109,12 @@
         with self.assertRaises(ImageObjectNotFound):
             args.func(args)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_utils.data_store.DataStore')
     def test_get_ticket_image_already_exists(self, mock_data_store,
-                                             mock_urlopen):
-        mock_urlopen.side_effect = [
-            FakeUrlOpenReturn(200, json.dumps(artifact_data))]
+                                             mock_requests):
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(artifact_data))]
         open(self.image_path, 'a').close()
         args = self.cli.parse_arguments(['get_image', '-t', '4', '-n',
                                          self.image_path])
@@ -139,13 +123,13 @@
                 "{} already exists.\n".format(self.image_path),
                 cm)
 
-    @mock.patch('urllib2.urlopen')
+    @mock.patch('requests.get')
     @mock.patch('ci_utils.data_store.create_for_ticket')
     def test_get_last_completed_ticket_image(self, mock_create_datastore,
-                                             mock_urlopen):
-        mock_urlopen.side_effect = [
-            FakeUrlOpenReturn(200, json.dumps(ticket_data)),
-            FakeUrlOpenReturn(200, json.dumps(artifact_data))
+                                             mock_requests):
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(ticket_data)),
+            FakeRequestsReturn(200, json.dumps(artifact_data))
         ]
         mock_datastore = mock.Mock()
         mock_datastore.get_file.return_value = buffer(" ")
@@ -159,11 +143,11 @@
                 "Image file can be found at: {}\n".format(self.image_path))
         mock_datastore.assert_called_once()
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_last_completed_ticket_none_complete(self, mock_urlopen):
+    @mock.patch('requests.get')
+    def test_get_last_completed_ticket_none_complete(self, mock_requests):
         data = {'objects': []}
-        mock_urlopen.side_effect = [
-            FakeUrlOpenReturn(200, json.dumps(data))]
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))]
         args = self.cli.parse_arguments(['get_image', '-n', self.image_path])
         with self.assertRaises(SystemExit) as cm:
             args.func(args)

=== modified file 'cli/ci_cli/tests/test_utils.py'
--- cli/ci_cli/tests/test_utils.py	2014-05-07 17:57:12 +0000
+++ cli/ci_cli/tests/test_utils.py	2014-05-27 09:44:30 +0000
@@ -21,6 +21,7 @@
 import tempfile
 
 from ci_cli import utils
+from ci_cli.tests import FakeRequestsReturn
 from ci_utils.testing import TestCaseWithGnupg
 
 
@@ -47,24 +48,24 @@
         location = 'http://www.example.com/api/v1/ticket/abc/123/'
         self.assertRaises(ValueError, utils.parse_id, location)
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_sourcepackage_uri(self, mock_urlopen):
+    @mock.patch('requests.get')
+    def test_get_sourcepackage_uri(self, mock_requests):
         data = {"objects": [{"resource_uri": "/api/v1/sourcepackage/4/"}]}
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         uri = utils.get_sourcepackage_uri('foobar')
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
         self.assertEquals(uri, '/api/v1/sourcepackage/4/')
 
-    @mock.patch('urllib2.urlopen')
-    def test_get_sourcepackage_uri_not_found(self, mock_urlopen):
+    @mock.patch('requests.get')
+    def test_get_sourcepackage_uri_not_found(self, mock_requests):
         data = {"objects": []}
-        resp = mock.Mock()
-        resp.read.return_value = json.dumps(data)
-        mock_urlopen.return_value = resp
+        mock_requests.side_effect = [
+            FakeRequestsReturn(200, json.dumps(data))
+        ]
         uri = utils.get_sourcepackage_uri('foobar')
-        mock_urlopen.assert_called_once()
+        mock_requests.assert_called_once()
         self.assertEquals(uri, '')
 
     def test_load_config(self):

=== modified file 'cli/ci_cli/utils.py'
--- cli/ci_cli/utils.py	2014-04-08 13:27:01 +0000
+++ cli/ci_cli/utils.py	2014-05-27 09:44:30 +0000
@@ -17,8 +17,8 @@
 import json
 import logging
 import sys
-import urllib2
 import yaml
+import requests
 
 from ci_utils import data_store
 
@@ -72,22 +72,19 @@
 
 
 def post(url, data, headers=HEADERS, patch=False):
-    req = urllib2.Request(url=url, data=json.dumps(data), headers=HEADERS)
-    f = urllib2.urlopen(req)
-    return f.info().dict['location']
+    req = requests.post(url=url, data=json.dumps(data), headers=HEADERS)
+    resp = req.headers
+    return resp['location']
 
 
 def patch(url, data, headers=HEADERS):
-    req = urllib2.Request(url=url, data=json.dumps(data), headers=HEADERS)
-    req.get_method = lambda: 'PATCH'
-    urllib2.urlopen(req)
+    requests.patch(url=url, data=json.dumps(data), headers=HEADERS)
 
 
 def get(url):
-    f = urllib2.urlopen(url)
-
-    json_data = f.read()
-    return json.loads(json_data)
+    r = requests.get(url)
+    r.raise_for_status()
+    return r.json()
 
 
 def parse_id(location):
@@ -101,9 +98,7 @@
 
 def get_sourcepackage_uri(sourcepackage):
     url = CI_URL + SOURCEPACKAGE_BASE + '?name__iexact=' + sourcepackage
-    f = urllib2.urlopen(url)
-    json_data = f.read()
-    data = json.loads(json_data)
+    data = get(url)
     try:
         sourcepackage_uri = data['objects'][0]['resource_uri']
         return sourcepackage_uri

=== modified file 'cli/setup.py'
--- cli/setup.py	2014-05-07 17:33:32 +0000
+++ cli/setup.py	2014-05-27 09:44:30 +0000
@@ -27,6 +27,7 @@
     'dput>=1.6',
     'lazr.enum>=1.1.2',
     'PyYAML==3.10',
+    'requests==2.2.1',
     'mock==1.0.1',
     'testfixtures>=3.0.1',
     'python-gnupg>=0.3.6',

=== modified file 'cli/ubuntu-ci'
--- cli/ubuntu-ci	2014-05-07 14:56:11 +0000
+++ cli/ubuntu-ci	2014-05-27 09:44:30 +0000
@@ -19,7 +19,8 @@
 import logging
 import os
 import sys
-import urllib2
+
+from requests import exceptions
 
 from ci_cli import (
     ticket,
@@ -78,8 +79,8 @@
                               help='Ticket to display status of. Leave off '
                               'for last successful ticket')
     image_parser.add_argument('-n', '--name',
-                               help='Desired file name (and path) for the '
-                               'downloaded image', required=True)
+                              help='Desired file name (and path) for the '
+                              'downloaded image', required=True)
     image_parser.set_defaults(func=image.get_image)
     return parser.parse_args(args)
 
@@ -153,10 +154,16 @@
     except image.ImageObjectNotFound as exc:
         log.error("Image cannot be downloaded: {} ({})".format(exc.filename,
                   str(exc)))
-    except urllib2.URLError as exc:
-        if isinstance(exc, urllib2.HTTPError):
-            reason = exc.reason
-            code = exc.code
+    except exceptions.RequestException as exc:
+        error = ("Cannot reach the server at {}. Please, check your "
+                 "configuration file ({}): is 'ci_url' correctly set? "
+                 "Is the server up and reachable from this machine? "
+                 "({}).".format(utils.CI_URL, utils.DEF_CFG, str(exc)))
+        if isinstance(exc, exceptions.HTTPError):
+            code = None
+            if exc.response:
+                code = exc.response.status_code
+
             if code == 500:
                 log.error("Server at {} reported internal error. Maybe a "
                           "database hiccup?".format(utils.CI_URL))
@@ -164,13 +171,9 @@
                 log.error("Server at {} not found. Is 'ci_url' correctly "
                           "set? ({})".format(utils.CI_URL, str(exc)))
             else:
-                log.error(str(exc))
+                log.error(error)
         else:
-            reason = exc.reason
-            log.error("Cannot reach the server at {}. Please, check your "
-                      "configuration file ({}): is 'ci_url' correctly set? "
-                      "Is the server up and reachable from this machine? "
-                      "({}).".format(utils.CI_URL, utils.DEF_CFG, reason))
+            log.error(error)
     except data_store.DataStoreException as exc:
         log.error("Data Store Error: {}".format(exc))
     except Exception:

=== modified file 'debian/control'
--- debian/control	2014-05-15 16:12:18 +0000
+++ debian/control	2014-05-27 09:44:30 +0000
@@ -32,6 +32,7 @@
  python-lazr.enum (>= 1.1.2-0~),
  python-yaml (>= 3.10-2),
  python-swiftclient,
+ python-requests (>=2.2.1),
  uci-utils (= ${binary:Version}),
  ${misc:Depends},
  ${python:Depends}