Author: tomaz
Date: Sat Dec 3 15:08:27 2011
New Revision: 1209930
URL: http://svn.apache.org/viewvc?rev=1209930&view=rev
Log:
Values passed to base64.bencode need to be bytes. More progress on porting to
py3k.
Modified:
libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py
libcloud/branches/py3k/libcloud/compute/drivers/cloudsigma.py
libcloud/branches/py3k/libcloud/compute/drivers/ecp.py
libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py
libcloud/branches/py3k/libcloud/compute/drivers/ibm_sbc.py
libcloud/branches/py3k/libcloud/compute/drivers/openstack.py
libcloud/branches/py3k/libcloud/compute/drivers/opsource.py
libcloud/branches/py3k/libcloud/compute/drivers/slicehost.py
libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py
libcloud/branches/py3k/libcloud/compute/drivers/vpsnet.py
Modified: libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py Sat Dec 3
15:08:27 2011
@@ -18,6 +18,8 @@ Brightbox Driver
from libcloud.py3 import httplib
import base64
+from libcloud.py3 import b
+
from libcloud.common.base import ConnectionUserAndKey, JsonResponse
from libcloud.compute.types import Provider, NodeState, InvalidCredsError
from libcloud.compute.base import NodeDriver
@@ -56,7 +58,8 @@ class BrightboxConnection(ConnectionUser
def _fetch_oauth_token(self):
body = json.dumps({'client_id': self.user_id, 'grant_type': 'none'})
- authorization = 'Basic ' + base64.encodestring('%s:%s' %
(self.user_id, self.key)).rstrip()
+ authorization = 'Basic ' + base64.encodestring(b('%s:%s' %
+ (self.user_id, self.key))).rstrip()
self.connect()
Modified: libcloud/branches/py3k/libcloud/compute/drivers/cloudsigma.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/cloudsigma.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/cloudsigma.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/cloudsigma.py Sat Dec 3
15:08:27 2011
@@ -20,6 +20,9 @@ import re
import time
import base64
+from libcloud.py3 import b
+
+
from libcloud.utils import str2dicts, str2list, dict2str
from libcloud.common.base import ConnectionUserAndKey, Response
from libcloud.common.types import InvalidCredsError
@@ -186,7 +189,8 @@ class CloudSigmaBaseConnection(Connectio
headers['Accept'] = 'application/json'
headers['Content-Type'] = 'application/json'
- headers['Authorization'] = 'Basic %s' % (base64.b64encode('%s:%s' %
(self.user_id, self.key)))
+ headers['Authorization'] = 'Basic %s' % (base64.b64encode(b('%s:%s' %
+ (self.user_id, self.key))))
return headers
Modified: libcloud/branches/py3k/libcloud/compute/drivers/ecp.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/ecp.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/ecp.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/ecp.py Sat Dec 3 15:08:27
2011
@@ -18,9 +18,11 @@ Enomaly ECP driver
"""
import time
import base64
-from libcloud.py3 import httplib
-import socket
import os
+import socket
+
+from libcloud.py3 import httplib
+from libcloud.py3 import b
# JSON is included in the standard library starting with Python 2.6. For 2.5
# and 2.4, there's a simplejson egg at: http://pypi.python.org/pypi/simplejson
@@ -83,7 +85,7 @@ class ECPConnection(ConnectionUserAndKey
username = self.user_id
password = self.key
base64string = base64.encodestring(
- '%s:%s' % (username, password))[:-1]
+ b('%s:%s' % (username, password)))[:-1]
authheader = "Basic %s" % base64string
headers['Authorization']= authheader
Modified: libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py Sat Dec 3
15:08:27 2011
@@ -21,7 +21,9 @@ http://www.elasticstack.com.
import re
import time
import base64
+
from libcloud.py3 import httplib
+from libcloud.py3 import b
try:
import simplejson as json
@@ -153,9 +155,9 @@ class ElasticStackBaseConnection(Connect
headers['Accept'] = 'application/json'
headers['Content-Type'] = 'application/json'
headers['Authorization'] = ('Basic %s'
- % (base64.b64encode('%s:%s'
+ % (base64.b64encode(b('%s:%s'
% (self.user_id,
- self.key))))
+ self.key)))))
return headers
Modified: libcloud/branches/py3k/libcloud/compute/drivers/ibm_sbc.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/ibm_sbc.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/ibm_sbc.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/ibm_sbc.py Sat Dec 3
15:08:27 2011
@@ -17,6 +17,8 @@ Driver for the IBM Developer Cloud.
"""
import base64, urllib
+from libcloud.py3 import b
+
from libcloud.common.base import XmlResponse, ConnectionUserAndKey
from libcloud.common.types import InvalidCredsError
from libcloud.compute.types import NodeState, Provider
@@ -47,7 +49,8 @@ class IBMConnection(ConnectionUserAndKey
def add_default_headers(self, headers):
headers['Accept'] = 'text/xml'
- headers['Authorization'] = ('Basic %s' % (base64.b64encode('%s:%s' %
(self.user_id, self.key))))
+ headers['Authorization'] = ('Basic %s' % (base64.b64encode(b('%s:%s' %
+ (self.user_id, self.key)))))
if not 'Content-Type' in headers:
headers['Content-Type'] = 'text/xml'
return headers
Modified: libcloud/branches/py3k/libcloud/compute/drivers/openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/openstack.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/openstack.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/openstack.py Sat Dec 3
15:08:27 2011
@@ -25,6 +25,9 @@ import os
import warnings
from libcloud.py3 import httplib
+ffrom libcloud.py3 import b
+rom libcloud.py3 import b
+
import base64
from xml.etree import ElementTree as ET
@@ -562,7 +565,7 @@ class OpenStack_1_0_NodeDriver(OpenStack
file_elm = ET.SubElement(personality_elm,
'file',
{'path': str(k)})
- file_elm.text = base64.b64encode(v)
+ file_elm.text = base64.b64encode(b(v))
return personality_elm
@@ -872,7 +875,7 @@ class OpenStack_1_1_NodeDriver(OpenStack
rv = []
for k, v in files.items():
- rv.append({'path': k, 'contents': base64.b64encode(v)})
+ rv.append({'path': k, 'contents': base64.b64encode(b(v))})
return rv
Modified: libcloud/branches/py3k/libcloud/compute/drivers/opsource.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/opsource.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/opsource.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/opsource.py Sat Dec 3
15:08:27 2011
@@ -17,7 +17,9 @@ Opsource Driver
"""
from xml.etree import ElementTree as ET
from base64 import b64encode
+
from libcloud.py3 import httplib
+from libcloud.py3 import b
from libcloud.compute.base import NodeDriver, Node, NodeAuthPassword
from libcloud.compute.base import NodeSize, NodeImage, NodeLocation
@@ -133,8 +135,8 @@ class OpsourceConnection(ConnectionUserA
responseCls = OpsourceResponse
def add_default_headers(self, headers):
- headers['Authorization'] = ('Basic %s' % b64encode('%s:%s' %
- (self.user_id, self.key)))
+ headers['Authorization'] = ('Basic %s' % b64encode(b('%s:%s' %
+ (self.user_id, self.key))))
return headers
def request(self, action, params=None, data='',
Modified: libcloud/branches/py3k/libcloud/compute/drivers/slicehost.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/slicehost.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/slicehost.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/slicehost.py Sat Dec 3
15:08:27 2011
@@ -21,6 +21,8 @@ import socket
from xml.etree import ElementTree as ET
from xml.parsers.expat import ExpatError
+from libcloud.py3 import b
+
from libcloud.common.base import ConnectionKey, XmlResponse
from libcloud.compute.types import NodeState, Provider, InvalidCredsError
from libcloud.compute.base import NodeSize, NodeDriver, NodeImage, NodeLocation
@@ -50,7 +52,7 @@ class SlicehostConnection(ConnectionKey)
def add_default_headers(self, headers):
headers['Authorization'] = ('Basic %s'
- % (base64.b64encode('%s:' % self.key)))
+ % (base64.b64encode(b('%s:' % self.key))))
return headers
Modified: libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py Sat Dec 3
15:08:27 2011
@@ -17,9 +17,13 @@ VMware vCloud driver.
"""
import base64
from libcloud.py3 import httplib
+from libcloud.py3 import urlparse
+from libcloud.py3 import b
+
+urlparse = urlparse.urlparse
+
import time
-from urlparse import urlparse
from xml.etree import ElementTree as ET
from xml.parsers.expat import ExpatError
@@ -226,7 +230,7 @@ class VCloudConnection(ConnectionUserAnd
return {
'Authorization':
"Basic %s"
- % base64.b64encode('%s:%s' % (self.user_id, self.key)),
+ % base64.b64encode(b('%s:%s' % (self.user_id, self.key))),
'Content-Length': 0
}
@@ -525,7 +529,7 @@ class VCloudNodeDriver(NodeDriver):
network = ''
password = None
- if kwargs.has_key('auth'):
+ if 'auth' in kwargs:
auth = kwargs['auth']
if isinstance(auth, NodeAuthPassword):
password = auth.password
@@ -585,7 +589,7 @@ class HostingComConnection(VCloudConnect
"""hosting.com doesn't follow the standard vCloud authentication API"""
return {
'Authentication':
- base64.b64encode('%s:%s' % (self.user_id, self.key)),
+ base64.b64encode(b('%s:%s' % (self.user_id, self.key))),
'Content-Length': 0
}
Modified: libcloud/branches/py3k/libcloud/compute/drivers/vpsnet.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/vpsnet.py?rev=1209930&r1=1209929&r2=1209930&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/vpsnet.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/vpsnet.py Sat Dec 3
15:08:27 2011
@@ -22,6 +22,8 @@ try:
except ImportError:
import json
+from libcloud.py3 import b
+
from libcloud.common.base import ConnectionUserAndKey, JsonResponse
from libcloud.common.types import InvalidCredsError, MalformedResponseError
from libcloud.compute.providers import Provider
@@ -68,7 +70,7 @@ class VPSNetConnection(ConnectionUserAnd
responseCls = VPSNetResponse
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
