Author: tomaz
Date: Fri Nov 16 05:15:11 2012
New Revision: 1410198
URL: http://svn.apache.org/viewvc?rev=1410198&view=rev
Log:
Fix a bug in local storage storage driver constructor.
Part of LIBCLOUD-258.
Modified:
libcloud/trunk/libcloud/common/base.py
libcloud/trunk/libcloud/storage/drivers/local.py
libcloud/trunk/libcloud/test/storage/test_local.py
Modified: libcloud/trunk/libcloud/common/base.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/common/base.py?rev=1410198&r1=1410197&r2=1410198&view=diff
==============================================================================
--- libcloud/trunk/libcloud/common/base.py (original)
+++ libcloud/trunk/libcloud/common/base.py Fri Nov 16 05:15:11 2012
@@ -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)
Modified: libcloud/trunk/libcloud/storage/drivers/local.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/storage/drivers/local.py?rev=1410198&r1=1410197&r2=1410198&view=diff
==============================================================================
--- libcloud/trunk/libcloud/storage/drivers/local.py (original)
+++ libcloud/trunk/libcloud/storage/drivers/local.py Fri Nov 16 05:15:11 2012
@@ -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')
Modified: libcloud/trunk/libcloud/test/storage/test_local.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/test/storage/test_local.py?rev=1410198&r1=1410197&r2=1410198&view=diff
==============================================================================
--- libcloud/trunk/libcloud/test/storage/test_local.py (original)
+++ libcloud/trunk/libcloud/test/storage/test_local.py Fri Nov 16 05:15:11 2012
@@ -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()
