Solving errors and refactor

server/lib/python/cartodb_services/test/test_mapboxgeocoder.py

@@ -1,7 +1,7 @@
 import unittest
 from mock import Mock
 from cartodb_services.mapbox import MapboxGeocoder
-from cartodb_services.mapbox import ServiceException
+from cartodb_services.tools.exceptions import ServiceException
 
 VALID_TOKEN = 'pk.eyJ1IjoiYWNhcmxvbiIsImEiOiJjamJuZjQ1Zjc0Ymt4Mnh0YmFrMmhtYnY4In0.gt9cw0VeKc3rM2mV5pcEmg'
 INVALID_TOKEN = 'invalid_token'

server/lib/python/cartodb_services/test/test_mapboxmatrix.py

@@ -2,7 +2,7 @@ import unittest
 from mock import Mock
 from cartodb_services.mapbox import MapboxMatrixClient
 from cartodb_services.mapbox.matrix_client import DEFAULT_PROFILE
-from cartodb_services.mapbox import ServiceException
+from cartodb_services.tools.exceptions import ServiceException
 from cartodb_services.tools import Coordinate
 
 VALID_TOKEN = 'pk.eyJ1IjoiYWNhcmxvbiIsImEiOiJjamJuZjQ1Zjc0Ymt4Mnh0YmFrMmhtYnY4In0.gt9cw0VeKc3rM2mV5pcEmg'

server/lib/python/cartodb_services/test/test_mapboxrouting.py

@@ -2,7 +2,7 @@ import unittest
 from mock import Mock
 from cartodb_services.mapbox import MapboxRouting
 from cartodb_services.mapbox.routing import DEFAULT_PROFILE
-from cartodb_services.mapbox import ServiceException
+from cartodb_services.tools.exceptions import ServiceException
 from cartodb_services.tools import Coordinate
 
 VALID_TOKEN = 'pk.eyJ1IjoiYWNhcmxvbiIsImEiOiJjamJuZjQ1Zjc0Ymt4Mnh0YmFrMmhtYnY4In0.gt9cw0VeKc3rM2mV5pcEmg'

server/lib/python/cartodb_services/test/test_mapzengeocoder.py

@@ -6,7 +6,8 @@ import requests_mock
 from mock import Mock
 
 from cartodb_services.mapzen import MapzenGeocoder
-from cartodb_services.mapzen.exceptions import MalformedResult, TimeoutException
+from cartodb_services.tools.exceptions import (MalformedResult,
+                                               TimeoutException)
 
 requests_mock.Mocker.TEST_PREFIX = 'test_'
 

server/lib/python/cartodb_services/test/test_mapzenisochrones.py

@@ -4,7 +4,7 @@ import requests_mock
 from mock import Mock
 
 from cartodb_services.mapzen import MapzenIsochrones
-from cartodb_services.mapzen.exceptions import ServiceException
+from cartodb_services.tools.exceptions import ServiceException
 
 requests_mock.Mocker.TEST_PREFIX = 'test_'
 

server/lib/python/cartodb_services/test/test_mapzenrouting.py

@@ -9,7 +9,7 @@ from urlparse import urlparse, parse_qs
 from mock import Mock
 
 from cartodb_services.mapzen import MapzenRouting, MapzenRoutingResponse
-from cartodb_services.mapzen.exceptions import WrongParams
+from cartodb_services.tools.exceptions import WrongParams
 from cartodb_services.tools import Coordinate
 
 requests_mock.Mocker.TEST_PREFIX = 'test_'

server/lib/python/cartodb_services/test/test_qps.py

@@ -2,13 +2,15 @@ import requests
 from unittest import TestCase
 from nose.tools import assert_raises
 from datetime import datetime, date
-from cartodb_services.mapzen.qps import qps_retry
-from cartodb_services.mapzen.exceptions import ServiceException, TimeoutException
+from cartodb_services.tools.qps import qps_retry
+from cartodb_services.tools.exceptions import (ServiceException,
+                                               TimeoutException)
 import requests_mock
 import mock
 
 requests_mock.Mocker.TEST_PREFIX = 'test_'
 
+
 @requests_mock.Mocker()
 class TestQPS(TestCase):
     QPS_ERROR_MESSAGE = "Queries per second exceeded: Queries exceeded (10 allowed)"
@@ -26,7 +28,7 @@ class TestQPS(TestCase):
             return self.QPS_ERROR_MESSAGE
 
         req_mock.register_uri('GET', 'http://localhost/test_qps',
-                       text=_text_cb)
+                              text=_text_cb)
         with self.assertRaises(TimeoutException):
             c = TestClass()
             c.test()