Merge "Python 3: fix urllib import"

This commit is contained in:
Jenkins
2016-07-08 14:25:35 +00:00
committed by Gerrit Code Review

View File

@@ -132,9 +132,8 @@ backwards compatibility. At first chance, set ``object_post_as_copy`` to
""" """
import os import os
from urllib import quote
from ConfigParser import ConfigParser, NoSectionError, NoOptionError from ConfigParser import ConfigParser, NoSectionError, NoOptionError
from six.moves.urllib.parse import unquote from six.moves.urllib.parse import quote, unquote
from swift.common import utils from swift.common import utils
from swift.common.utils import get_logger, \ from swift.common.utils import get_logger, \