Author: tomaz
Date: Sat Mar 16 04:18:30 2013
New Revision: 1457201
URL: http://svn.apache.org/r1457201
Log:
Backport commits from trunk.
Modified:
libcloud/branches/0.12.x/ (props changed)
libcloud/branches/0.12.x/CHANGES
libcloud/branches/0.12.x/libcloud/common/gandi.py
Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
Merged /libcloud/trunk:r1451201-1453704,1453706-1454171,1454972-1457200
Modified: libcloud/branches/0.12.x/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/CHANGES?rev=1457201&r1=1457200&r2=1457201&view=diff
==============================================================================
--- libcloud/branches/0.12.x/CHANGES (original)
+++ libcloud/branches/0.12.x/CHANGES Sat Mar 16 04:18:30 2013
@@ -8,6 +8,12 @@ Changes with Apache Libcloud in developm
Reported by Arfrever Frehtes Taifersar Arahesis.
[Tomaz Muraus]
+ - Fix a regression introduced with recent xmlrpiclib changes which broke
all
+ the Gandi.net drivers. (LIBCLOUD-288)
+
+ Reported by Hutson Betts.
+ [Tomaz Muraus]
+
- Improve deploy code to work correctly if the ssh user doesn't have access
to the /root directory.
Modified: libcloud/branches/0.12.x/libcloud/common/gandi.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/common/gandi.py?rev=1457201&r1=1457200&r2=1457201&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/common/gandi.py (original)
+++ libcloud/branches/0.12.x/libcloud/common/gandi.py Sat Mar 16 04:18:30 2013
@@ -57,6 +57,14 @@ class GandiConnection(XMLRPCConnection,
host = 'rpc.gandi.net'
endpoint = '/xmlrpc/'
+ def __init__(self, key, secure=True):
+ # Note: Method resolution order in this case is
+ # XMLRPCConnection -> Connection and Connection doesn't take key as the
+ # first argument so we specify a keyword argument instead.
+ # Previously it was GandiConnection -> ConnectionKey so it worked fine.
+ super(GandiConnection, self).__init__(key=key, secure=secure)
+ self.driver = BaseGandiDriver
+
def request(self, method, *args):
args = (self.key, ) + args
return super(GandiConnection, self).request(method, *args)
