Merge "Switch all uses of ConfigParser to import from six"
diff --git a/tempest/services/botoclients.py b/tempest/services/botoclients.py
index 95c05d7..ede464f 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