Author: tomaz
Date: Sat Dec 3 14:57:04 2011
New Revision: 1209923
URL: http://svn.apache.org/viewvc?rev=1209923&view=rev
Log:
Use libcloud.py3.{urllib,httplib}.
Modified:
libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py
libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py
libcloud/branches/py3k/libcloud/compute/drivers/ecp.py
libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py
libcloud/branches/py3k/libcloud/compute/drivers/openstack.py
libcloud/branches/py3k/libcloud/compute/drivers/opsource.py
libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py
libcloud/branches/py3k/test/compute/test_bluebox.py
libcloud/branches/py3k/test/compute/test_brightbox.py
libcloud/branches/py3k/test/compute/test_cloudsigma.py
libcloud/branches/py3k/test/compute/test_cloudstack.py
libcloud/branches/py3k/test/compute/test_deployment.py
libcloud/branches/py3k/test/compute/test_dreamhost.py
libcloud/branches/py3k/test/compute/test_ecp.py
libcloud/branches/py3k/test/compute/test_elasticstack.py
libcloud/branches/py3k/test/compute/test_gandi.py
libcloud/branches/py3k/test/compute/test_gogrid.py
libcloud/branches/py3k/test/compute/test_ibm_sbc.py
libcloud/branches/py3k/test/compute/test_linode.py
libcloud/branches/py3k/test/compute/test_openstack.py
libcloud/branches/py3k/test/compute/test_opsource.py
libcloud/branches/py3k/test/compute/test_rimuhosting.py
libcloud/branches/py3k/test/compute/test_slicehost.py
libcloud/branches/py3k/test/compute/test_softlayer.py
libcloud/branches/py3k/test/compute/test_vcloud.py
libcloud/branches/py3k/test/compute/test_voxel.py
libcloud/branches/py3k/test/compute/test_vpsnet.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=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/bluebox.py Sat Dec 3
14:57:04 2011
@@ -23,7 +23,7 @@ Blue Box API documentation https://bo
"""
import copy
-import urllib
+from libcloud.py3 import urllib
import base64
from libcloud.common.base import JsonResponse, ConnectionUserAndKey
Modified: libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/brightbox.py Sat Dec 3
14:57:04 2011
@@ -15,7 +15,7 @@
"""
Brightbox Driver
"""
-import httplib
+from libcloud.py3 import httplib
import base64
from libcloud.common.base import ConnectionUserAndKey, JsonResponse
Modified: libcloud/branches/py3k/libcloud/compute/drivers/ecp.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/ecp.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/ecp.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/ecp.py Sat Dec 3 14:57:04
2011
@@ -18,7 +18,7 @@ Enomaly ECP driver
"""
import time
import base64
-import httplib
+from libcloud.py3 import httplib
import socket
import os
Modified: libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/elasticstack.py Sat Dec 3
14:57:04 2011
@@ -21,7 +21,7 @@ http://www.elasticstack.com.
import re
import time
import base64
-import httplib
+from libcloud.py3 import httplib
try:
import simplejson as json
Modified: libcloud/branches/py3k/libcloud/compute/drivers/openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/openstack.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/openstack.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/openstack.py Sat Dec 3
14:57:04 2011
@@ -24,7 +24,7 @@ except ImportError:
import os
import warnings
-import httplib
+from libcloud.py3 import httplib
import base64
from xml.etree import ElementTree as ET
Modified: libcloud/branches/py3k/libcloud/compute/drivers/opsource.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/opsource.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/opsource.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/opsource.py Sat Dec 3
14:57:04 2011
@@ -17,7 +17,7 @@ Opsource Driver
"""
from xml.etree import ElementTree as ET
from base64 import b64encode
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.base import NodeDriver, Node, NodeAuthPassword
from libcloud.compute.base import NodeSize, NodeImage, NodeLocation
Modified: libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py (original)
+++ libcloud/branches/py3k/libcloud/compute/drivers/vcloud.py Sat Dec 3
14:57:04 2011
@@ -16,7 +16,7 @@
VMware vCloud driver.
"""
import base64
-import httplib
+from libcloud.py3 import httplib
import time
from urlparse import urlparse
Modified: libcloud/branches/py3k/test/compute/test_bluebox.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_bluebox.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_bluebox.py (original)
+++ libcloud/branches/py3k/test/compute/test_bluebox.py Sat Dec 3 14:57:04 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.drivers.bluebox import BlueboxNodeDriver as Bluebox
from libcloud.compute.base import Node, NodeAuthPassword
Modified: libcloud/branches/py3k/test/compute/test_brightbox.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_brightbox.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_brightbox.py (original)
+++ libcloud/branches/py3k/test/compute/test_brightbox.py Sat Dec 3 14:57:04
2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
try:
import simplejson as json
Modified: libcloud/branches/py3k/test/compute/test_cloudsigma.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_cloudsigma.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_cloudsigma.py (original)
+++ libcloud/branches/py3k/test/compute/test_cloudsigma.py Sat Dec 3 14:57:04
2011
@@ -15,7 +15,7 @@
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.base import Node
from libcloud.compute.drivers.cloudsigma import CloudSigmaZrhNodeDriver
Modified: libcloud/branches/py3k/test/compute/test_cloudstack.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_cloudstack.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_cloudstack.py (original)
+++ libcloud/branches/py3k/test/compute/test_cloudstack.py Sat Dec 3 14:57:04
2011
@@ -1,4 +1,4 @@
-import httplib
+from libcloud.py3 import httplib
import sys
import unittest
import urlparse
Modified: libcloud/branches/py3k/test/compute/test_deployment.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_deployment.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_deployment.py (original)
+++ libcloud/branches/py3k/test/compute/test_deployment.py Sat Dec 3 14:57:04
2011
@@ -17,7 +17,7 @@
import sys
import time
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.deployment import MultiStepDeployment, Deployment
from libcloud.compute.deployment import SSHKeyDeployment, ScriptDeployment
Modified: libcloud/branches/py3k/test/compute/test_dreamhost.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_dreamhost.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_dreamhost.py (original)
+++ libcloud/branches/py3k/test/compute/test_dreamhost.py Sat Dec 3 14:57:04
2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
try:
import simplejson as json
Modified: libcloud/branches/py3k/test/compute/test_ecp.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_ecp.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_ecp.py (original)
+++ libcloud/branches/py3k/test/compute/test_ecp.py Sat Dec 3 14:57:04 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.drivers.ecp import ECPNodeDriver
from libcloud.compute.types import NodeState
Modified: libcloud/branches/py3k/test/compute/test_elasticstack.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_elasticstack.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_elasticstack.py (original)
+++ libcloud/branches/py3k/test/compute/test_elasticstack.py Sat Dec 3
14:57:04 2011
@@ -15,7 +15,7 @@
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.base import Node
from libcloud.compute.types import Provider
Modified: libcloud/branches/py3k/test/compute/test_gandi.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_gandi.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_gandi.py (original)
+++ libcloud/branches/py3k/test/compute/test_gandi.py Sat Dec 3 14:57:04 2011
@@ -17,7 +17,7 @@ import unittest
import sys
import random
import string
-import httplib
+from libcloud.py3 import httplib
import xmlrpclib
from libcloud.compute.drivers.gandi import GandiNodeDriver as Gandi
Modified: libcloud/branches/py3k/test/compute/test_gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_gogrid.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_gogrid.py (original)
+++ libcloud/branches/py3k/test/compute/test_gogrid.py Sat Dec 3 14:57:04 2011
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-import httplib
+from libcloud.py3 import httplib
import sys
import unittest
import urlparse
Modified: libcloud/branches/py3k/test/compute/test_ibm_sbc.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_ibm_sbc.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_ibm_sbc.py (original)
+++ libcloud/branches/py3k/test/compute/test_ibm_sbc.py Sat Dec 3 14:57:04 2011
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
import unittest
-import httplib
+from libcloud.py3 import httplib
import sys
from libcloud.compute.types import InvalidCredsError
Modified: libcloud/branches/py3k/test/compute/test_linode.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_linode.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_linode.py (original)
+++ libcloud/branches/py3k/test/compute/test_linode.py Sat Dec 3 14:57:04 2011
@@ -19,7 +19,7 @@
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.drivers.linode import LinodeNodeDriver
from libcloud.compute.base import Node, NodeAuthPassword
Modified: libcloud/branches/py3k/test/compute/test_openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_openstack.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_openstack.py (original)
+++ libcloud/branches/py3k/test/compute/test_openstack.py Sat Dec 3 14:57:04
2011
@@ -15,7 +15,7 @@
import sys
import unittest
import types
-import httplib
+from libcloud.py3 import httplib
from libcloud.common.types import InvalidCredsError, MalformedResponseError
from libcloud.compute.types import Provider
Modified: libcloud/branches/py3k/test/compute/test_opsource.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_opsource.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_opsource.py (original)
+++ libcloud/branches/py3k/test/compute/test_opsource.py Sat Dec 3 14:57:04
2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.common.types import InvalidCredsError
from libcloud.compute.drivers.opsource import OpsourceNodeDriver as Opsource
Modified: libcloud/branches/py3k/test/compute/test_rimuhosting.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_rimuhosting.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_rimuhosting.py (original)
+++ libcloud/branches/py3k/test/compute/test_rimuhosting.py Sat Dec 3 14:57:04
2011
@@ -16,7 +16,7 @@
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.drivers.rimuhosting import RimuHostingNodeDriver
Modified: libcloud/branches/py3k/test/compute/test_slicehost.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_slicehost.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_slicehost.py (original)
+++ libcloud/branches/py3k/test/compute/test_slicehost.py Sat Dec 3 14:57:04
2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from xml.etree import ElementTree as ET
Modified: libcloud/branches/py3k/test/compute/test_softlayer.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_softlayer.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_softlayer.py (original)
+++ libcloud/branches/py3k/test/compute/test_softlayer.py Sat Dec 3 14:57:04
2011
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import httplib
+from libcloud.py3 import httplib
import unittest
import sys
Modified: libcloud/branches/py3k/test/compute/test_vcloud.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_vcloud.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_vcloud.py (original)
+++ libcloud/branches/py3k/test/compute/test_vcloud.py Sat Dec 3 14:57:04 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.drivers.vcloud import TerremarkDriver
from libcloud.compute.drivers.vcloud import VCloudNodeDriver
Modified: libcloud/branches/py3k/test/compute/test_voxel.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_voxel.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_voxel.py (original)
+++ libcloud/branches/py3k/test/compute/test_voxel.py Sat Dec 3 14:57:04 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.base import Node, NodeSize, NodeImage, NodeLocation
from libcloud.compute.drivers.voxel import VoxelNodeDriver as Voxel
Modified: libcloud/branches/py3k/test/compute/test_vpsnet.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/py3k/test/compute/test_vpsnet.py?rev=1209923&r1=1209922&r2=1209923&view=diff
==============================================================================
--- libcloud/branches/py3k/test/compute/test_vpsnet.py (original)
+++ libcloud/branches/py3k/test/compute/test_vpsnet.py Sat Dec 3 14:57:04 2011
@@ -15,7 +15,7 @@
import sys
import unittest
import exceptions
-import httplib
+from libcloud.py3 import httplib
from libcloud.compute.drivers.vpsnet import VPSNetNodeDriver
from libcloud.compute.base import Node
