Author: tomaz
Date: Sat Dec 3 14:58:08 2011
New Revision: 1209925
URL: http://svn.apache.org/viewvc?rev=1209925&view=rev
Log:
Bluebox driver tests now pass.
Modified:
libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py
Modified: libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py?rev=1209925&r1=1209924&r2=1209925&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py Sat Dec 3
14:58:08 2011
@@ -26,6 +26,8 @@ import copy
from libcloud.py3 import urllib
import base64
+from libcloud.py3 import b
+
from libcloud.common.base import JsonResponse, ConnectionUserAndKey
from libcloud.compute.providers import Provider
from libcloud.compute.types import NodeState, InvalidCredsError
@@ -112,7 +114,7 @@ class BlueboxConnection(ConnectionUserAn
responseCls = BlueboxResponse
def add_default_headers(self, headers):
- user_b64 = base64.b64encode('%s:%s' % (self.user_id, self.key))
+ user_b64 = base64.b64encode(b('%s:%s' % (self.user_id, self.key)))
headers['Authorization'] = 'Basic %s' % (user_b64)
return headers
@@ -132,7 +134,7 @@ class BlueboxNodeDriver(NodeDriver):
def list_sizes(self, location=None):
sizes = []
- for key, values in BLUEBOX_INSTANCE_TYPES.iteritems():
+ for key, values in BLUEBOX_INSTANCE_TYPES.items():
attributes = copy.deepcopy(values)
attributes.update({ 'price': self._get_size_price(size_id=key) })
sizes.append(BlueboxNodeSize(driver=self.connection.driver,
