Author: tomaz
Date: Sun Dec 4 13:40:12 2011
New Revision: 1210112
URL: http://svn.apache.org/viewvc?rev=1210112&view=rev
Log:
Remove old deprecated paths. Also fix some imports.
Removed:
libcloud/trunk/libcloud/base.py
libcloud/trunk/libcloud/deployment.py
libcloud/trunk/libcloud/drivers/
libcloud/trunk/libcloud/providers.py
libcloud/trunk/libcloud/py3.py
libcloud/trunk/libcloud/ssh.py
libcloud/trunk/libcloud/types.py
libcloud/trunk/test/compute/test_backward_compatibility.py
Modified:
libcloud/trunk/CHANGES
libcloud/trunk/setup.py
libcloud/trunk/test/__init__.py
libcloud/trunk/test/common/test_cloudstack.py
libcloud/trunk/test/compute/test_bluebox.py
libcloud/trunk/test/compute/test_brightbox.py
libcloud/trunk/test/compute/test_cloudsigma.py
libcloud/trunk/test/compute/test_cloudstack.py
libcloud/trunk/test/compute/test_deployment.py
libcloud/trunk/test/compute/test_dreamhost.py
libcloud/trunk/test/compute/test_ec2.py
libcloud/trunk/test/compute/test_ecp.py
libcloud/trunk/test/compute/test_elasticstack.py
libcloud/trunk/test/compute/test_gandi.py
libcloud/trunk/test/compute/test_gogrid.py
libcloud/trunk/test/compute/test_ibm_sbc.py
libcloud/trunk/test/compute/test_linode.py
libcloud/trunk/test/compute/test_opennebula.py
libcloud/trunk/test/compute/test_openstack.py
libcloud/trunk/test/compute/test_opsource.py
libcloud/trunk/test/compute/test_rimuhosting.py
libcloud/trunk/test/compute/test_slicehost.py
libcloud/trunk/test/compute/test_softlayer.py
libcloud/trunk/test/compute/test_vcloud.py
libcloud/trunk/test/compute/test_voxel.py
libcloud/trunk/test/compute/test_vpsnet.py
libcloud/trunk/test/dns/test_linode.py
libcloud/trunk/test/dns/test_rackspace.py
libcloud/trunk/test/dns/test_zerigo.py
libcloud/trunk/test/file_fixtures.py
libcloud/trunk/test/loadbalancer/test_cloudstack.py
libcloud/trunk/test/loadbalancer/test_gogrid.py
libcloud/trunk/test/loadbalancer/test_rackspace.py
libcloud/trunk/test/storage/test_atmos.py
libcloud/trunk/test/storage/test_base.py
libcloud/trunk/test/storage/test_cloudfiles.py
libcloud/trunk/test/storage/test_s3.py
libcloud/trunk/test/test_response_classes.py
libcloud/trunk/test/test_utils.py
Modified: libcloud/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Sun Dec 4 13:40:12 2011
@@ -6,6 +6,9 @@ Changes with Apache Libcloud in developm
- Add support for Python 3.x.
[Tomaz Muraus]
+ - Remove old deprecated paths.
+ [Tomaz Muraus]
+
*) Compute:
- Update CloudSigma Zurich API endpoint address.
Modified: libcloud/trunk/setup.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/setup.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/setup.py (original)
+++ libcloud/trunk/setup.py Sun Dec 4 13:40:12 2011
@@ -213,7 +213,6 @@ setup(
'libcloud.compute.drivers',
'libcloud.storage',
'libcloud.storage.drivers',
- 'libcloud.drivers',
'libcloud.loadbalancer',
'libcloud.loadbalancer.drivers',
'libcloud.dns',
Modified: libcloud/trunk/test/__init__.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/__init__.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/__init__.py (original)
+++ libcloud/trunk/test/__init__.py Sun Dec 4 13:40:12 2011
@@ -18,10 +18,10 @@ import unittest
from cgi import parse_qs
-from libcloud.py3 import httplib
-from libcloud.py3 import StringIO
-from libcloud.py3 import urlparse
-from libcloud.py3 import u
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import StringIO
+from libcloud.utils.py3 import urlparse
+from libcloud.utils.py3 import u
XML_HEADERS = {'content-type': 'application/xml'}
Modified: libcloud/trunk/test/common/test_cloudstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/common/test_cloudstack.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/common/test_cloudstack.py (original)
+++ libcloud/trunk/test/common/test_cloudstack.py Sun Dec 4 13:40:12 2011
@@ -6,9 +6,9 @@ try:
except ImportError:
import json
-from libcloud.py3 import httplib
-from libcloud.py3 import urlparse
-from libcloud.py3 import b
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import urlparse
+from libcloud.utils.py3 import b
try:
parse_qsl = urlparse.parse_qsl
Modified: libcloud/trunk/test/compute/test_bluebox.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_bluebox.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_bluebox.py (original)
+++ libcloud/trunk/test/compute/test_bluebox.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.bluebox import BlueboxNodeDriver as Bluebox
from libcloud.compute.base import Node, NodeAuthPassword
Modified: libcloud/trunk/test/compute/test_brightbox.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_brightbox.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_brightbox.py (original)
+++ libcloud/trunk/test/compute/test_brightbox.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
try:
import simplejson as json
Modified: libcloud/trunk/test/compute/test_cloudsigma.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_cloudsigma.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_cloudsigma.py (original)
+++ libcloud/trunk/test/compute/test_cloudsigma.py Sun Dec 4 13:40:12 2011
@@ -15,7 +15,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.base import Node
from libcloud.compute.drivers.cloudsigma import CloudSigmaZrhNodeDriver
Modified: libcloud/trunk/test/compute/test_cloudstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_cloudstack.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_cloudstack.py (original)
+++ libcloud/trunk/test/compute/test_cloudstack.py Sun Dec 4 13:40:12 2011
@@ -1,8 +1,8 @@
import sys
import unittest
-from libcloud.py3 import httplib
-from libcloud.py3 import urlparse
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import urlparse
try:
import simplejson as json
Modified: libcloud/trunk/test/compute/test_deployment.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_deployment.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_deployment.py (original)
+++ libcloud/trunk/test/compute/test_deployment.py Sun Dec 4 13:40:12 2011
@@ -18,8 +18,8 @@ import sys
import time
import unittest
-from libcloud.py3 import httplib
-from libcloud.py3 import u
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import u
from libcloud.compute.deployment import MultiStepDeployment, Deployment
from libcloud.compute.deployment import SSHKeyDeployment, ScriptDeployment
Modified: libcloud/trunk/test/compute/test_dreamhost.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_dreamhost.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_dreamhost.py (original)
+++ libcloud/trunk/test/compute/test_dreamhost.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
try:
import simplejson as json
Modified: libcloud/trunk/test/compute/test_ec2.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_ec2.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_ec2.py (original)
+++ libcloud/trunk/test/compute/test_ec2.py Sun Dec 4 13:40:12 2011
@@ -15,7 +15,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.ec2 import EC2NodeDriver, EC2APSENodeDriver
from libcloud.compute.drivers.ec2 import NimbusNodeDriver, EucNodeDriver
Modified: libcloud/trunk/test/compute/test_ecp.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_ecp.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_ecp.py (original)
+++ libcloud/trunk/test/compute/test_ecp.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.ecp import ECPNodeDriver
from libcloud.compute.types import NodeState
Modified: libcloud/trunk/test/compute/test_elasticstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_elasticstack.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_elasticstack.py (original)
+++ libcloud/trunk/test/compute/test_elasticstack.py Sun Dec 4 13:40:12 2011
@@ -15,7 +15,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.base import Node
from libcloud.compute.types import Provider
Modified: libcloud/trunk/test/compute/test_gandi.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_gandi.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_gandi.py (original)
+++ libcloud/trunk/test/compute/test_gandi.py Sun Dec 4 13:40:12 2011
@@ -18,8 +18,8 @@ import sys
import random
import string
-from libcloud.py3 import httplib
-from libcloud.py3 import xmlrpclib
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import xmlrpclib
from libcloud.compute.drivers.gandi import GandiNodeDriver as Gandi
from libcloud.common.gandi import GandiException
Modified: libcloud/trunk/test/compute/test_gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_gogrid.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_gogrid.py (original)
+++ libcloud/trunk/test/compute/test_gogrid.py Sun Dec 4 13:40:12 2011
@@ -15,8 +15,8 @@
import sys
import unittest
-from libcloud.py3 import httplib
-from libcloud.py3 import urlparse
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import urlparse
from libcloud.compute.base import NodeState, NodeLocation
from libcloud.common.types import LibcloudError, InvalidCredsError
Modified: libcloud/trunk/test/compute/test_ibm_sbc.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_ibm_sbc.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_ibm_sbc.py (original)
+++ libcloud/trunk/test/compute/test_ibm_sbc.py Sun Dec 4 13:40:12 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
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
import sys
from libcloud.compute.types import InvalidCredsError
Modified: libcloud/trunk/test/compute/test_linode.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_linode.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_linode.py (original)
+++ libcloud/trunk/test/compute/test_linode.py Sun Dec 4 13:40:12 2011
@@ -19,7 +19,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.linode import LinodeNodeDriver
from libcloud.compute.base import Node, NodeAuthPassword
Modified: libcloud/trunk/test/compute/test_opennebula.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_opennebula.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_opennebula.py (original)
+++ libcloud/trunk/test/compute/test_opennebula.py Sun Dec 4 13:40:12 2011
@@ -25,7 +25,7 @@ __docformat__ = 'epytext'
import unittest
import sys
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.base import Node, NodeImage, NodeSize, NodeState
from libcloud.compute.drivers.opennebula import *
Modified: libcloud/trunk/test/compute/test_openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_openstack.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_openstack.py (original)
+++ libcloud/trunk/test/compute/test_openstack.py Sun Dec 4 13:40:12 2011
@@ -16,9 +16,9 @@ import sys
import unittest
import types
-from libcloud.py3 import httplib
-from libcloud.py3 import method_type
-from libcloud.py3 import u
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import method_type
+from libcloud.utils.py3 import u
from libcloud.common.types import InvalidCredsError, MalformedResponseError
from libcloud.compute.types import Provider
Modified: libcloud/trunk/test/compute/test_opsource.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_opsource.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_opsource.py (original)
+++ libcloud/trunk/test/compute/test_opsource.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.common.types import InvalidCredsError
from libcloud.compute.drivers.opsource import OpsourceNodeDriver as Opsource
Modified: libcloud/trunk/test/compute/test_rimuhosting.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_rimuhosting.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_rimuhosting.py (original)
+++ libcloud/trunk/test/compute/test_rimuhosting.py Sun Dec 4 13:40:12 2011
@@ -16,7 +16,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.rimuhosting import RimuHostingNodeDriver
Modified: libcloud/trunk/test/compute/test_slicehost.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_slicehost.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_slicehost.py (original)
+++ libcloud/trunk/test/compute/test_slicehost.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from xml.etree import ElementTree as ET
Modified: libcloud/trunk/test/compute/test_softlayer.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_softlayer.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_softlayer.py (original)
+++ libcloud/trunk/test/compute/test_softlayer.py Sun Dec 4 13:40:12 2011
@@ -18,9 +18,9 @@ import sys
from xml.etree import ElementTree as ET
-from libcloud.py3 import httplib
-from libcloud.py3 import xmlrpclib
-from libcloud.py3 import next
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import xmlrpclib
+from libcloud.utils.py3 import next
from libcloud.compute.drivers.softlayer import SoftLayerNodeDriver as SoftLayer
from libcloud.compute.types import NodeState
Modified: libcloud/trunk/test/compute/test_vcloud.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_vcloud.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_vcloud.py (original)
+++ libcloud/trunk/test/compute/test_vcloud.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.vcloud import TerremarkDriver
from libcloud.compute.drivers.vcloud import VCloudNodeDriver
Modified: libcloud/trunk/test/compute/test_voxel.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_voxel.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_voxel.py (original)
+++ libcloud/trunk/test/compute/test_voxel.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.base import Node, NodeSize, NodeImage, NodeLocation
from libcloud.compute.drivers.voxel import VoxelNodeDriver as Voxel
Modified: libcloud/trunk/test/compute/test_vpsnet.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_vpsnet.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_vpsnet.py (original)
+++ libcloud/trunk/test/compute/test_vpsnet.py Sun Dec 4 13:40:12 2011
@@ -14,7 +14,7 @@
# limitations under the License.
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.compute.drivers.vpsnet import VPSNetNodeDriver
from libcloud.compute.base import Node
Modified: libcloud/trunk/test/dns/test_linode.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/dns/test_linode.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/dns/test_linode.py (original)
+++ libcloud/trunk/test/dns/test_linode.py Sun Dec 4 13:40:12 2011
@@ -15,7 +15,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.common.linode import LinodeException
from libcloud.dns.types import RecordType, ZoneDoesNotExistError
Modified: libcloud/trunk/test/dns/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/dns/test_rackspace.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/dns/test_rackspace.py (original)
+++ libcloud/trunk/test/dns/test_rackspace.py Sun Dec 4 13:40:12 2011
@@ -15,7 +15,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.common.types import LibcloudError
from libcloud.dns.types import RecordType, ZoneDoesNotExistError
Modified: libcloud/trunk/test/dns/test_zerigo.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/dns/test_zerigo.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/dns/test_zerigo.py (original)
+++ libcloud/trunk/test/dns/test_zerigo.py Sun Dec 4 13:40:12 2011
@@ -15,7 +15,7 @@
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.common.types import InvalidCredsError, LibcloudError
from libcloud.dns.types import RecordType, ZoneDoesNotExistError
Modified: libcloud/trunk/test/file_fixtures.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/file_fixtures.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/file_fixtures.py (original)
+++ libcloud/trunk/test/file_fixtures.py Sun Dec 4 13:40:12 2011
@@ -18,7 +18,7 @@ from __future__ import with_statement
import os
-from libcloud.py3 import u
+from libcloud.utils.py3 import u
FIXTURES_ROOT = {
'compute': 'compute/fixtures',
Modified: libcloud/trunk/test/loadbalancer/test_cloudstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_cloudstack.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_cloudstack.py (original)
+++ libcloud/trunk/test/loadbalancer/test_cloudstack.py Sun Dec 4 13:40:12 2011
@@ -6,8 +6,8 @@ try:
except ImportError:
import json
-from libcloud.py3 import httplib
-from libcloud.py3 import urlparse
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import urlparse
try:
parse_qsl = urlparse.parse_qsl
Modified: libcloud/trunk/test/loadbalancer/test_gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_gogrid.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_gogrid.py (original)
+++ libcloud/trunk/test/loadbalancer/test_gogrid.py Sun Dec 4 13:40:12 2011
@@ -16,8 +16,8 @@
import sys
import unittest
-from libcloud.py3 import httplib
-from libcloud.py3 import urlparse
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import urlparse
from libcloud.common.types import LibcloudError
from libcloud.compute.base import Node
Modified: libcloud/trunk/test/loadbalancer/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_rackspace.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_rackspace.py (original)
+++ libcloud/trunk/test/loadbalancer/test_rackspace.py Sun Dec 4 13:40:12 2011
@@ -21,7 +21,7 @@ try:
except ImportError:
import json
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.loadbalancer.base import Member, Algorithm
from libcloud.loadbalancer.drivers.rackspace import RackspaceLBDriver
Modified: libcloud/trunk/test/storage/test_atmos.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/storage/test_atmos.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/storage/test_atmos.py (original)
+++ libcloud/trunk/test/storage/test_atmos.py Sun Dec 4 13:40:12 2011
@@ -18,9 +18,9 @@ import os.path
import sys
import unittest
-from libcloud.py3 import httplib
-from libcloud.py3 import urlparse
-from libcloud.py3 import b
+from libcloud.utils.py3 import httplib
+from libcloud.utils.py3 import urlparse
+from libcloud.utils.py3 import b
import libcloud.utils.files
Modified: libcloud/trunk/test/storage/test_base.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/storage/test_base.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/storage/test_base.py (original)
+++ libcloud/trunk/test/storage/test_base.py Sun Dec 4 13:40:12 2011
@@ -19,9 +19,9 @@ import hashlib
from mock import Mock
-from libcloud.py3 import StringIO
-from libcloud.py3 import PY3
-from libcloud.py3 import b
+from libcloud.utils.py3 import StringIO
+from libcloud.utils.py3 import PY3
+from libcloud.utils.py3 import b
if PY3:
from io import FileIO as file
Modified: libcloud/trunk/test/storage/test_cloudfiles.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/storage/test_cloudfiles.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/storage/test_cloudfiles.py (original)
+++ libcloud/trunk/test/storage/test_cloudfiles.py Sun Dec 4 13:40:12 2011
@@ -20,8 +20,8 @@ import unittest
import libcloud.utils.files
-from libcloud.py3 import PY3
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import PY3
+from libcloud.utils.py3 import httplib
if PY3:
from io import FileIO as file
Modified: libcloud/trunk/test/storage/test_s3.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/storage/test_s3.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/storage/test_s3.py (original)
+++ libcloud/trunk/test/storage/test_s3.py Sun Dec 4 13:40:12 2011
@@ -17,7 +17,7 @@ import os
import sys
import unittest
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.common.types import InvalidCredsError
from libcloud.common.types import LibcloudError
Modified: libcloud/trunk/test/test_response_classes.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/test_response_classes.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/test_response_classes.py (original)
+++ libcloud/trunk/test/test_response_classes.py Sun Dec 4 13:40:12 2011
@@ -18,7 +18,7 @@ import unittest
from mock import Mock
-from libcloud.py3 import httplib
+from libcloud.utils.py3 import httplib
from libcloud.common.base import XmlResponse, JsonResponse
from libcloud.common.types import MalformedResponseError
Modified: libcloud/trunk/test/test_utils.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/test_utils.py?rev=1210112&r1=1210111&r2=1210112&view=diff
==============================================================================
--- libcloud/trunk/test/test_utils.py (original)
+++ libcloud/trunk/test/test_utils.py Sun Dec 4 13:40:12 2011
@@ -26,8 +26,8 @@ import libcloud.utils.files
from libcloud.utils.misc import get_driver
-from libcloud.py3 import StringIO
-from libcloud.py3 import PY3
+from libcloud.utils.py3 import StringIO
+from libcloud.utils.py3 import PY3
from libcloud.compute.types import Provider
from libcloud.compute.providers import DRIVERS
