You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2015/04/06 12:02:12 UTC
[13/52] [abbrv] libcloud git commit: backing out fix
backing out fix
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/579cfe27
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/579cfe27
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/579cfe27
Branch: refs/heads/trunk
Commit: 579cfe277939a642bd2e3d687b4a9db20c5b7630
Parents: 1f75d75
Author: Matt Baldwin <ba...@gmail.com>
Authored: Tue Jul 1 12:46:31 2014 -0700
Committer: Michael Bennett <mi...@securitycompass.com>
Committed: Wed Nov 19 13:03:15 2014 -0500
----------------------------------------------------------------------
libcloud/compute/drivers/azure.py | 12 +++++++++---
libcloud/test/compute/test_azure.py | 1 +
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/579cfe27/libcloud/compute/drivers/azure.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/azure.py b/libcloud/compute/drivers/azure.py
index 8b61c8e..6154fb3 100644
--- a/libcloud/compute/drivers/azure.py
+++ b/libcloud/compute/drivers/azure.py
@@ -15,6 +15,7 @@
"""Azure Compute driver
"""
+import httplib
import re
import time
import collections
@@ -23,7 +24,6 @@ import sys
import copy
import base64
-from libcloud.utils.py3 import httplib
from libcloud.common.azure import AzureServiceManagementConnection
from libcloud.compute.providers import Provider
from libcloud.compute.base import Node, NodeDriver, NodeLocation, NodeSize
@@ -36,8 +36,14 @@ from xml.dom import minidom
from xml.sax.saxutils import escape as xml_escape
from httplib import (HTTPSConnection)
-from libcloud.utils.py3 import urlquote
-from libcloud.utils.py3 import urlunquote
+if sys.version_info < (3,):
+ from urllib2 import quote as url_quote
+ from urllib2 import unquote as url_unquote
+ _strtype = basestring
+else:
+ from urllib.parse import quote as url_quote
+ from urllib.parse import unquote as url_unquote
+ _strtype = str
if sys.version_info < (3,):
_unicode_type = unicode
http://git-wip-us.apache.org/repos/asf/libcloud/blob/579cfe27/libcloud/test/compute/test_azure.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_azure.py b/libcloud/test/compute/test_azure.py
index f3d6aaf..4f76e85 100644
--- a/libcloud/test/compute/test_azure.py
+++ b/libcloud/test/compute/test_azure.py
@@ -1,6 +1,7 @@
import libcloud
from libcloud.common.types import LibcloudError
from libcloud.compute.base import NodeAuthPassword
+from libcloud.common.azure import AzureServiceManagementConnection
__author__ = 'david'