From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 11 Jun 2015 11:37:59 +0000 (+0000)
Subject: Merge "Replace urllib and urllib2 with six.moves.urllib"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6feb65dcf4690f236afcf89bfd9509462c55befe;p=openstack-build%2Fcinder-build.git

Merge "Replace urllib and urllib2 with six.moves.urllib"
---

6feb65dcf4690f236afcf89bfd9509462c55befe
diff --cc cinder/volume/drivers/emc/emc_vmax_https.py
index 0aabb3177,309ca2670..837f717a3
--- a/cinder/volume/drivers/emc/emc_vmax_https.py
+++ b/cinder/volume/drivers/emc/emc_vmax_https.py
@@@ -309,10 -309,10 +309,10 @@@ def wbem_request(url, data, creds, head
              h.putheader('PegasusAuthorization', 'Local "%s"' % locallogin)
  
          for hdr in headers:
 -            if isinstance(hdr, unicode):
 +            if isinstance(hdr, six.text_type):
                  hdr = hdr.encode('utf-8')
              s = map(lambda x: string.strip(x), string.split(hdr, ":", 1))
-             h.putheader(urllib.quote(s[0]), urllib.quote(s[1]))
+             h.putheader(urllib.parse.quote(s[0]), urllib.parse.quote(s[1]))
  
          try:
              h.endheaders()