From 7543ad10b56c55afd12ec141876eeb0f312e36ca Mon Sep 17 00:00:00 2001 From: Mahendra M Date: Wed, 14 Nov 2012 17:33:05 +0530 Subject: [PATCH] LIBCLOUD-258 : Bug in local storage driver init --- libcloud/common/base.py | 2 +- libcloud/storage/drivers/local.py | 2 +- libcloud/test/storage/test_local.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git libcloud/common/base.py libcloud/common/base.py index 021fea7..91ca544 100644 --- libcloud/common/base.py +++ libcloud/common/base.py @@ -807,7 +807,7 @@ class BaseDriver(object): def __init__(self, key, secret=None, secure=True, host=None, port=None, api_version=None, **kwargs): """ - @param key: API key or username to used (required) + @param key: API key or username to be used (required) @type key: C{str} @param secret: Secret password to be used (required) diff --git libcloud/storage/drivers/local.py libcloud/storage/drivers/local.py index 36099f8..3819eb2 100644 --- libcloud/storage/drivers/local.py +++ libcloud/storage/drivers/local.py @@ -80,7 +80,7 @@ class LocalStorageDriver(StorageDriver): **kwargs): # Use the key as the path to the storage - self.base_path = key[0] + self.base_path = key if not os.path.isdir(self.base_path): raise LibcloudError('The base path is not a directory') diff --git libcloud/test/storage/test_local.py libcloud/test/storage/test_local.py index 8755fc0..ae316f3 100644 --- libcloud/test/storage/test_local.py +++ libcloud/test/storage/test_local.py @@ -40,7 +40,7 @@ class LocalTests(unittest.TestCase): @classmethod def create_driver(self): self.key = tempfile.mkdtemp() - return self.driver_type((self.key, None)) + return self.driver_type(self.key, None) def setUp(self): self.driver = self.create_driver() -- 1.7.10.4