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

diff --cc cinder/volume/drivers/emc/emc_vmax_https.py
index 0aabb3177ddb8bf7a2ea085ad1fd2723e8303153,309ca2670265eb1e9fd70e74dd321f37d7ffd61a..837f717a35d77374b5db1ba94cdd4aa243f6f888
--- 1/cinder/volume/drivers/emc/emc_vmax_https.py
--- 2/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()