Merge "Remove six.moves.urllib"
This commit is contained in:
commit
6673930aa4
@ -18,13 +18,13 @@
|
||||
|
||||
import copy
|
||||
import logging
|
||||
from urllib import parse
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import strutils
|
||||
import re
|
||||
import requests
|
||||
import six
|
||||
from six.moves.urllib import parse
|
||||
|
||||
from manilaclient import exceptions
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from six.moves.urllib import parse
|
||||
from urllib import parse
|
||||
|
||||
from manilaclient import api_versions
|
||||
from manilaclient.common import httpclient
|
||||
|
@ -10,8 +10,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from urllib import parse
|
||||
|
||||
import six
|
||||
from six.moves.urllib import parse
|
||||
|
||||
|
||||
class HookableMixin(object):
|
||||
|
Loading…
x
Reference in New Issue
Block a user