You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/11/28 05:24:49 UTC

[10/10] libcloud git commit: Replace Distutils.version LooseVersion with a customised version. Temp workaround until Travis CI support Distutils.version with pylint Closes #940

Replace Distutils.version LooseVersion with a customised version. Temp workaround until Travis CI support Distutils.version with pylint
Closes #940


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

Branch: refs/heads/trunk
Commit: 216a24fbe7d74a99ee9f2595850c04d1bdd7b034
Parents: 71a42ca
Author: Samuel Chong <sa...@gmail.com>
Authored: Thu Nov 24 12:28:04 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Mon Nov 28 16:24:16 2016 +1100

----------------------------------------------------------------------
 libcloud/common/dimensiondata.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/216a24fb/libcloud/common/dimensiondata.py
----------------------------------------------------------------------
diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 0cb726f..a8f5917 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -17,18 +17,15 @@ Dimension Data Common Components
 """
 from base64 import b64encode
 from time import sleep
-
-try:
-    from distutils.version import LooseVersion  # pylint: disable=import-error
-except ImportError:
-    pass
-
+# TODO: use disutils.version when Travis CI fixed the pylint issue with version
+# from distutils.version import LooseVersion
 from libcloud.utils.py3 import httplib
 from libcloud.utils.py3 import b
 from libcloud.common.base import ConnectionUserAndKey, XmlResponse, RawResponse
 from libcloud.compute.base import Node
 from libcloud.utils.py3 import basestring
 from libcloud.utils.xml import findtext
+from libcloud.compute.types import LibcloudError, InvalidCredsError
 
 # Roadmap / TODO:
 #
@@ -318,6 +315,12 @@ def dd_object_to_id(obj, obj_type, id_value='id'):
         )
 
 
+# TODO: use disutils.version when Travis CI fixed the pylint issue with version
+#       This is a temporary workaround.
+def LooseVersion(version):
+    return float(version)
+
+
 class NetworkDomainServicePlan(object):
     ESSENTIALS = "ESSENTIALS"
     ADVANCED = "ADVANCED"