re-applying the fix
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ae395495 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ae395495 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ae395495 Branch: refs/heads/trunk Commit: ae39549560001dd67bc4f2447b5da471d37bfce1 Parents: 579cfe2 Author: Matt Baldwin <[email protected]> Authored: Tue Jul 1 12:53:56 2014 -0700 Committer: Michael Bennett <[email protected]> Committed: Wed Nov 19 13:03:15 2014 -0500 ---------------------------------------------------------------------- libcloud/compute/drivers/azure.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ae395495/libcloud/compute/drivers/azure.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/azure.py b/libcloud/compute/drivers/azure.py index 6154fb3..fe95f85 100644 --- a/libcloud/compute/drivers/azure.py +++ b/libcloud/compute/drivers/azure.py @@ -24,6 +24,8 @@ import sys import copy import base64 +from libcloud.utils.py3 import urlquote as url_quote +from libcloud.utils.py3 import urlunquote as url_unquote from libcloud.common.azure import AzureServiceManagementConnection from libcloud.compute.providers import Provider from libcloud.compute.base import Node, NodeDriver, NodeLocation, NodeSize @@ -37,15 +39,6 @@ from xml.sax.saxutils import escape as xml_escape from httplib import (HTTPSConnection) 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 def _str(value):
