diff --git a/openstack-common.conf b/openstack-common.conf index fd948cad2..932266ea7 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -4,7 +4,6 @@ module=excutils module=importutils module=jsonutils -module=py3kcompat module=timeutils module=uuidutils diff --git a/taskflow/examples/example_utils.py b/taskflow/examples/example_utils.py index da1f8a19e..3da680e2e 100644 --- a/taskflow/examples/example_utils.py +++ b/taskflow/examples/example_utils.py @@ -21,8 +21,9 @@ import shutil import sys import tempfile +from six.moves import urllib_parse + from taskflow import exceptions -from taskflow.openstack.common.py3kcompat import urlutils from taskflow.persistence import backends LOG = logging.getLogger(__name__) @@ -50,7 +51,7 @@ def rm_path(persist_path): def _make_conf(backend_uri): - parsed_url = urlutils.urlparse(backend_uri) + parsed_url = urllib_parse.urlparse(backend_uri) backend_type = parsed_url.scheme.lower() if not backend_type: raise ValueError("Unknown backend type for uri: %s" % (backend_type)) diff --git a/taskflow/openstack/common/py3kcompat/__init__.py b/taskflow/openstack/common/py3kcompat/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/taskflow/openstack/common/py3kcompat/urlutils.py b/taskflow/openstack/common/py3kcompat/urlutils.py deleted file mode 100644 index 84e457a44..000000000 --- a/taskflow/openstack/common/py3kcompat/urlutils.py +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright 2013 Canonical Ltd. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -""" -Python2/Python3 compatibility layer for OpenStack -""" - -import six - -if six.PY3: - # python3 - import urllib.error - import urllib.parse - import urllib.request - - urlencode = urllib.parse.urlencode - urljoin = urllib.parse.urljoin - quote = urllib.parse.quote - quote_plus = urllib.parse.quote_plus - parse_qsl = urllib.parse.parse_qsl - unquote = urllib.parse.unquote - unquote_plus = urllib.parse.unquote_plus - urlparse = urllib.parse.urlparse - urlsplit = urllib.parse.urlsplit - urlunsplit = urllib.parse.urlunsplit - SplitResult = urllib.parse.SplitResult - - urlopen = urllib.request.urlopen - URLError = urllib.error.URLError - pathname2url = urllib.request.pathname2url -else: - # python2 - import urllib - import urllib2 - import urlparse - - urlencode = urllib.urlencode - quote = urllib.quote - quote_plus = urllib.quote_plus - unquote = urllib.unquote - unquote_plus = urllib.unquote_plus - - parse = urlparse - parse_qsl = parse.parse_qsl - urljoin = parse.urljoin - urlparse = parse.urlparse - urlsplit = parse.urlsplit - urlunsplit = parse.urlunsplit - SplitResult = parse.SplitResult - - urlopen = urllib2.urlopen - URLError = urllib2.URLError - pathname2url = urllib.pathname2url diff --git a/taskflow/persistence/backends/__init__.py b/taskflow/persistence/backends/__init__.py index 37e214af7..09a3101d0 100644 --- a/taskflow/persistence/backends/__init__.py +++ b/taskflow/persistence/backends/__init__.py @@ -16,10 +16,10 @@ import logging +from six.moves import urllib_parse from stevedore import driver from taskflow import exceptions as exc -from taskflow.openstack.common.py3kcompat import urlutils # NOTE(harlowja): this is the entrypoint namespace, not the module namespace. @@ -29,7 +29,7 @@ LOG = logging.getLogger(__name__) def fetch(conf, namespace=BACKEND_NAMESPACE): - backend_name = urlutils.urlparse(conf['connection']).scheme + backend_name = urllib_parse.urlparse(conf['connection']).scheme LOG.debug('Looking for %r backend driver in %r', backend_name, namespace) try: mgr = driver.DriverManager(namespace, backend_name,