Merge "Remove six.moves.urllib"
This commit is contained in:
commit
727493c7bf
|
@ -32,7 +32,8 @@ from keystoneclient import discover
|
||||||
from keystoneclient import exceptions as ks_exc
|
from keystoneclient import exceptions as ks_exc
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from oslo_utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
import six.moves.urllib.parse as urlparse
|
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
from cliff import app
|
from cliff import app
|
||||||
from cliff import commandmanager
|
from cliff import commandmanager
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import six.moves.urllib.parse as urlparse
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
from tackerclient.common import exceptions
|
from tackerclient.common import exceptions
|
||||||
|
|
||||||
|
|
|
@ -20,10 +20,11 @@ import urllib
|
||||||
import contextlib
|
import contextlib
|
||||||
import fixtures
|
import fixtures
|
||||||
import six
|
import six
|
||||||
import six.moves.urllib.parse as urlparse
|
|
||||||
import sys
|
import sys
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
from tackerclient.common import constants
|
from tackerclient.common import constants
|
||||||
from tackerclient.common import exceptions
|
from tackerclient.common import exceptions
|
||||||
from tackerclient import shell
|
from tackerclient import shell
|
||||||
|
|
|
@ -19,7 +19,8 @@ import logging
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
import six.moves.urllib.parse as urlparse
|
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
from tackerclient import client
|
from tackerclient import client
|
||||||
from tackerclient.common import constants
|
from tackerclient.common import constants
|
||||||
|
|
Loading…
Reference in New Issue