Fix lint and more Python version compatibility issues.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/dd00bc93 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/dd00bc93 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/dd00bc93 Branch: refs/heads/trunk Commit: dd00bc9301f62ac4ea076dd1a22c8d2596457849 Parents: 3ce62e8 Author: Tomaz Muraus <[email protected]> Authored: Sun Apr 5 18:40:02 2015 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Sun Apr 5 18:40:02 2015 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/azure.py | 17 +++++++++-------- libcloud/test/compute/test_azure.py | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/dd00bc93/libcloud/compute/drivers/azure.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/azure.py b/libcloud/compute/drivers/azure.py index 106a095..f07ed90 100644 --- a/libcloud/compute/drivers/azure.py +++ b/libcloud/compute/drivers/azure.py @@ -1717,14 +1717,15 @@ class AzureNodeDriver(NodeDriver): return self._get_path('services/disks', disk_name) def _get_role_path(self, service_name, deployment_name, role_name=None): - return self._get_path( - 'services/hostedservices/' - + _str(service_name) - + '/deployments/' - + deployment_name - + '/roles', - role_name - ) + components = [ + 'services/hostedservices/', + _str(service_name), + '/deployments/', + deployment_name, + '/roles' + ] + resource = ''.join(components) + return self._get_path(resource, role_name) def _get_storage_service_path(self, service_name=None): return self._get_path('services/storageservices', service_name) http://git-wip-us.apache.org/repos/asf/libcloud/blob/dd00bc93/libcloud/test/compute/test_azure.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_azure.py b/libcloud/test/compute/test_azure.py index 109471f..73fd334 100644 --- a/libcloud/test/compute/test_azure.py +++ b/libcloud/test/compute/test_azure.py @@ -20,10 +20,10 @@ from libcloud.compute.drivers.azure import azure_service_management_host import os import sys - -import unittest import libcloud.security +from libcloud.test import unittest +from libcloud.test import LibcloudTestCase from libcloud.test import MockHttp from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.utils.py3 import httplib @@ -32,7 +32,7 @@ from libcloud.compute.types import Provider from libcloud.compute.providers import get_driver -class AzureNodeDriverTests(unittest.TestCase): +class AzureNodeDriverTests(LibcloudTestCase): # required otherwise we get client side SSL verification libcloud.security.VERIFY_SSL_CERT = False
