Indicate which constants have been deprecated.

Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1519257f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1519257f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1519257f

Branch: refs/heads/trunk
Commit: 1519257f6e0735f6088c002e9c9fe3f5a2d10973
Parents: bba0c2c
Author: Tomaz Muraus <[email protected]>
Authored: Thu Oct 17 21:11:18 2013 +0200
Committer: Tomaz Muraus <[email protected]>
Committed: Thu Oct 17 21:11:18 2013 +0200

----------------------------------------------------------------------
 libcloud/compute/types.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/1519257f/libcloud/compute/types.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/types.py b/libcloud/compute/types.py
index bae12ef..bf0d158 100644
--- a/libcloud/compute/types.py
+++ b/libcloud/compute/types.py
@@ -92,14 +92,6 @@ class Provider(object):
     OPENNEBULA = 'opennebula'
     DREAMHOST = 'dreamhost'
     ELASTICHOSTS = 'elastichosts'
-    ELASTICHOSTS_UK1 = 'elastichosts_uk1'
-    ELASTICHOSTS_UK2 = 'elastichosts_uk2'
-    ELASTICHOSTS_US1 = 'elastichosts_us1'
-    ELASTICHOSTS_US2 = 'elastichosts_us2'
-    ELASTICHOSTS_US3 = 'elastichosts_us3'
-    ELASTICHOSTS_CA1 = 'elastichosts_ca1'
-    ELASTICHOSTS_AU1 = 'elastichosts_au1'
-    ELASTICHOSTS_CN1 = 'elastichosts_cn1'
     BRIGHTBOX = 'brightbox'
     CLOUDSIGMA = 'cloudsigma'
     NIMBUS = 'nimbus'
@@ -135,6 +127,15 @@ class Provider(object):
     EC2_SA_EAST = 'ec2_sa_east'
     EC2_AP_SOUTHEAST2 = 'ec2_ap_southeast_2'
 
+    ELASTICHOSTS_UK1 = 'elastichosts_uk1'
+    ELASTICHOSTS_UK2 = 'elastichosts_uk2'
+    ELASTICHOSTS_US1 = 'elastichosts_us1'
+    ELASTICHOSTS_US2 = 'elastichosts_us2'
+    ELASTICHOSTS_US3 = 'elastichosts_us3'
+    ELASTICHOSTS_CA1 = 'elastichosts_ca1'
+    ELASTICHOSTS_AU1 = 'elastichosts_au1'
+    ELASTICHOSTS_CN1 = 'elastichosts_cn1'
+
     # Deprecated constants which aren't supported anymore
     RACKSPACE_UK = 'rackspace_uk'
     RACKSPACE_NOVA_BETA = 'rackspace_nova_beta'
@@ -191,7 +192,8 @@ class DeploymentError(LibcloudError):
     """
     Exception used when a Deployment Task failed.
 
-    :ivar node: :class:`Node` on which this exception happened, you might want 
to call :class:`Node.destroy`
+    :ivar node: :class:`Node` on which this exception happened, you might want
+                to call :func:`Node.destroy`
     """
     def __init__(self, node, original_exception=None, driver=None):
         self.node = node

Reply via email to