Merge "Use six.moves.urllib.parse urlencode"

This commit is contained in:
Jenkins 2016-04-21 13:38:39 +00:00 committed by Gerrit Code Review
commit 8d79acda0f
6 changed files with 10 additions and 25 deletions

@ -17,13 +17,10 @@
Volume snapshot interface (1.1 extension).
"""
try:
from urllib import urlencode
except ImportError:
from urllib.parse import urlencode
import six
from six.moves.urllib.parse import urlencode
from cinderclient import base
import six
class Snapshot(base.Resource):

@ -17,11 +17,9 @@
Volume transfer interface (1.1 extension).
"""
try:
from urllib import urlencode
except ImportError:
from urllib.parse import urlencode
import six
from six.moves.urllib.parse import urlencode
from cinderclient import base

@ -17,11 +17,9 @@
Volume interface (1.1 extension).
"""
try:
from urllib import urlencode
except ImportError:
from urllib.parse import urlencode
import six
from six.moves.urllib.parse import urlencode
from cinderclient import base

@ -16,10 +16,7 @@
"""cgsnapshot interface (v3 extension)."""
import six
try:
from urllib import urlencode
except ImportError:
from urllib.parse import urlencode
from six.moves.urllib.parse import urlencode
from cinderclient import base
from cinderclient.openstack.common.apiclient import base as common_base

@ -16,10 +16,7 @@
"""Consistencygroup interface (v3 extension)."""
import six
try:
from urllib import urlencode
except ImportError:
from urllib.parse import urlencode
from six.moves.urllib.parse import urlencode
from cinderclient import base
from cinderclient.openstack.common.apiclient import base as common_base

@ -17,11 +17,9 @@
Volume transfer interface (v3 extension).
"""
try:
from urllib import urlencode
except ImportError:
from urllib.parse import urlencode
import six
from six.moves.urllib.parse import urlencode
from cinderclient import base