Return-Path: X-Original-To: apmail-libcloud-commits-archive@www.apache.org Delivered-To: apmail-libcloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D9B2678AA for ; Sat, 3 Dec 2011 14:51:00 +0000 (UTC) Received: (qmail 90618 invoked by uid 500); 3 Dec 2011 14:51:00 -0000 Delivered-To: apmail-libcloud-commits-archive@libcloud.apache.org Received: (qmail 90595 invoked by uid 500); 3 Dec 2011 14:51:00 -0000 Mailing-List: contact commits-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list commits@libcloud.apache.org Received: (qmail 90588 invoked by uid 99); 3 Dec 2011 14:51:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2011 14:51:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2011 14:50:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4ECDB23888FD; Sat, 3 Dec 2011 14:50:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209922 - in /libcloud/branches/py3k: libcloud/compute/drivers/opennebula.py test/compute/test_opennebula.py Date: Sat, 03 Dec 2011 14:50:36 -0000 To: commits@libcloud.apache.org From: tomaz@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111203145036.4ECDB23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomaz Date: Sat Dec 3 14:50:35 2011 New Revision: 1209922 URL: http://svn.apache.org/viewvc?rev=1209922&view=rev Log: OpenNebula driver tests now pass on py3k. Modified: libcloud/branches/py3k/libcloud/compute/drivers/opennebula.py libcloud/branches/py3k/test/compute/test_opennebula.py Modified: libcloud/branches/py3k/libcloud/compute/drivers/opennebula.py URL: http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/opennebula.py?rev=1209922&r1=1209921&r2=1209922&view=diff ============================================================================== --- libcloud/branches/py3k/libcloud/compute/drivers/opennebula.py (original) +++ libcloud/branches/py3k/libcloud/compute/drivers/opennebula.py Sat Dec 3 14:50:35 2011 @@ -30,7 +30,10 @@ except ImportError: from xml.etree import ElementTree as ET from base64 import b64encode import hashlib -import httplib + +from libcloud.py3 import httplib +from libcloud.py3 import next +from libcloud.py3 import b from libcloud.compute.base import NodeState, NodeDriver, Node, NodeLocation from libcloud.common.base import ConnectionUserAndKey, XmlResponse @@ -113,9 +116,9 @@ class OpenNebulaConnection(ConnectionUse @rtype: C{dict} @return: Dictionary containing updated headers. """ - pass_sha1 = hashlib.sha1(self.key).hexdigest() - headers['Authorization'] = ('Basic %s' % b64encode('%s:%s' % - (self.user_id, pass_sha1))) + pass_sha1 = hashlib.sha1(b(self.key)).hexdigest() + headers['Authorization'] = ('Basic %s' % b64encode(b('%s:%s' % + (self.user_id, pass_sha1)))) return headers @@ -194,7 +197,7 @@ class OpenNebulaNetwork(object): @rtype: C{string} @return: Unique identifier for this instance. """ - return hashlib.sha1("%s:%d" % (self.id, self.driver.type)).hexdigest() + return hashlib.sha1(b("%s:%d" % (self.id, self.driver.type))).hexdigest() def destroy(self): """ @@ -859,8 +862,8 @@ class OpenNebula_2_0_NodeDriver(OpenNebu instance_type = compute.find('INSTANCE_TYPE') try: - return (node_size for node_size in self.list_sizes() - if node_size.name == instance_type.text).next() + return next((node_size for node_size in self.list_sizes() + if node_size.name == instance_type.text)) except StopIteration: return None Modified: libcloud/branches/py3k/test/compute/test_opennebula.py URL: http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_opennebula.py?rev=1209922&r1=1209921&r2=1209922&view=diff ============================================================================== --- libcloud/branches/py3k/test/compute/test_opennebula.py (original) +++ libcloud/branches/py3k/test/compute/test_opennebula.py Sat Dec 3 14:50:35 2011 @@ -23,9 +23,10 @@ OpenNebula.org test suite. __docformat__ = 'epytext' import unittest -import httplib import sys +from libcloud.py3 import httplib + from libcloud.compute.base import Node, NodeImage, NodeSize, NodeState from libcloud.compute.drivers.opennebula import *