Merge "Use six.moves.urllib.parse urlencode"
This commit is contained in:
commit
8d79acda0f
@ -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
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user