summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-28 21:30:29 +0000
committerGerrit Code Review <review@openstack.org>2015-04-28 21:30:29 +0000
commit9f5de85ca0e36017360d9492a16939be155ab814 (patch)
tree6f06e749a2e73517edc061d433bf3f153e97b17d
parenta25df11b572df08de73f2a365bfb41c1cfaec2eb (diff)
parentfcd9a080dba1237780361b28b38c15ece634e176 (diff)
downloadtempest-9f5de85ca0e36017360d9492a16939be155ab814.tar.gz
Merge "Switch all uses of ConfigParser to import from six"
-rw-r--r--tempest/services/botoclients.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tempest/services/botoclients.py b/tempest/services/botoclients.py
index 95c05d7f5..ede464f8a 100644
--- a/tempest/services/botoclients.py
+++ b/tempest/services/botoclients.py
@@ -13,13 +13,13 @@
# License for the specific language governing permissions and limitations
# under the License.
-import ConfigParser
import contextlib
import types
import boto
import boto.ec2
import boto.s3.connection
+from six.moves import configparser as ConfigParser
from six.moves.urllib import parse as urlparse
from tempest_lib import exceptions as lib_exc