svn commit: r1141513 - in /libcloud/trunk/test: common/test_cloudstack.py compute/test_cloudstack.py loadbalancer/test_cloudstack.py

[tomaz]

Author: tomaz
Date: Thu Jun 30 12:44:51 2011
New Revision: 1141513

URL: http://svn.apache.org/viewvc?rev=1141513&view=rev
Log:
Fix a bug with parse_qsl and python 2.5

Modified:
    libcloud/trunk/test/common/test_cloudstack.py
    libcloud/trunk/test/compute/test_cloudstack.py
    libcloud/trunk/test/loadbalancer/test_cloudstack.py

Modified: libcloud/trunk/test/common/test_cloudstack.py
URL: 
http://svn.apache.org/viewvc/libcloud/trunk/test/common/test_cloudstack.py?rev=1141513&r1=1141512&r2=1141513&view=diff
==============================================================================
--- libcloud/trunk/test/common/test_cloudstack.py (original)
+++ libcloud/trunk/test/common/test_cloudstack.py Thu Jun 30 12:44:51 2011
@@ -8,6 +8,12 @@ try:
 except:
     import simplejson as json
 
+try:
+    parse_qsl = urlparse.parse_qsl
+except AttributeError:
+    import cgi
+    parse_qsl = cgi.parse_qsl
+
 from libcloud.common.cloudstack import CloudStackConnection, CloudStackResponse
 from libcloud.common.types import MalformedResponseError
 
@@ -104,7 +110,7 @@ class CloudStackMockHttp(MockHttpTestCas
 
     def _check_request(self, url):
         url = urlparse.urlparse(url)
-        query = dict(urlparse.parse_qsl(url.query))
+        query = dict(parse_qsl(url.query))
 
         self.assertTrue('apiKey' in query)
         self.assertTrue('command' in query)

Modified: libcloud/trunk/test/compute/test_cloudstack.py
URL: 
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_cloudstack.py?rev=1141513&r1=1141512&r2=1141513&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_cloudstack.py (original)
+++ libcloud/trunk/test/compute/test_cloudstack.py Thu Jun 30 12:44:51 2011
@@ -8,6 +8,12 @@ try:
 except:
     import simplejson as json
 
+try:
+    parse_qsl = urlparse.parse_qsl
+except AttributeError:
+    import cgi
+    parse_qsl = cgi.parse_qsl
+
 from libcloud.compute.drivers.cloudstack import CloudStackNodeDriver
 from libcloud.compute.types import DeploymentError
 
@@ -58,7 +64,7 @@ class CloudStackMockHttp(MockHttpTestCas
 
     def _test_path(self, method, url, body, headers):
         url = urlparse.urlparse(url)
-        query = dict(urlparse.parse_qsl(url.query))
+        query = dict(parse_qsl(url.query))
 
         self.assertTrue('apiKey' in query)
         self.assertTrue('command' in query)

Modified: libcloud/trunk/test/loadbalancer/test_cloudstack.py
URL: 
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_cloudstack.py?rev=1141513&r1=1141512&r2=1141513&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_cloudstack.py (original)
+++ libcloud/trunk/test/loadbalancer/test_cloudstack.py Thu Jun 30 12:44:51 2011
@@ -8,6 +8,12 @@ try:
 except:
     import simplejson as json
 
+try:
+    parse_qsl = urlparse.parse_qsl
+except AttributeError:
+    import cgi
+    parse_qsl = cgi.parse_qsl
+
 from libcloud.common.types import LibcloudError
 from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm
 from libcloud.loadbalancer.drivers.cloudstack import CloudStackLBDriver
@@ -65,7 +71,7 @@ class CloudStackMockHttp(MockHttpTestCas
 
     def _test_path(self, method, url, body, headers):
         url = urlparse.urlparse(url)
-        query = dict(urlparse.parse_qsl(url.query))
+        query = dict(parse_qsl(url.query))
 
         self.assertTrue('apiKey' in query)
         self.assertTrue('command' in query)