update for py3 imports

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/ragweed/framework.py b/ragweed/framework.py
index fea6a8db51e39f9090d6d519ff1015666935350c..233c57eb354bfce11ef183af003437c8f9627012 100644 (file)
--- a/ragweed/framework.py
+++ b/ragweed/framework.py
@@ -7,11 +7,11 @@ import inspect
 import pickle
 import bunch
 import yaml
-import ConfigParser
-import rados
+import configparser
 from boto.s3.key import Key
 from nose.plugins.attrib import attr
 from nose.tools import eq_ as eq
+import rados
 
 from .reqs import _make_admin_request
 
@@ -378,7 +378,7 @@ class RagweedEnv:
     def __init__(self):
         self.config = bunch.Bunch()
 
-        cfg = ConfigParser.RawConfigParser()
+        cfg = configparser.RawConfigParser()
         try:
             path = os.environ['RAGWEED_CONF']
         except KeyError:
@@ -407,19 +407,19 @@ class RagweedEnv:
             for var in str_config_opts:
                 try:
                     cur[name][var] = cfg.get(section, var)
-                except ConfigParser.NoOptionError:
+                except configparser.NoOptionError:
                     pass
 
             for var in int_config_opts:
                 try:
                     cur[name][var] = cfg.getint(section, var)
-                except ConfigParser.NoOptionError:
+                except configparser.NoOptionError:
                     pass
 
             for var in bool_config_opts:
                 try:
                     cur[name][var] = cfg.getboolean(section, var)
-                except ConfigParser.NoOptionError:
+                except configparser.NoOptionError:
                     pass
 
         print(json.dumps(self.config))

diff --git a/ragweed/reqs.py b/ragweed/reqs.py
index cdc0511ec5b9363958c7836c70691b9db322efb5..2f7c57dde485c81f2b44bc26a0855128a557ac0f 100644 (file)
--- a/ragweed/reqs.py
+++ b/ragweed/reqs.py
@@ -1,6 +1,6 @@
 import boto.s3.connection
-from httplib import HTTPConnection, HTTPSConnection
-from urlparse import urlparse
+from http.client import HTTPConnection, HTTPSConnection
+from urllib.parse import urlparse
 import urllib
 
 def _make_admin_request(conn, method, path, query_dict=None, body=None, response_headers=None, request_headers=None, expires_in=100000, path_style=True, timeout=None):
@@ -100,7 +100,7 @@ def _make_raw_request(host, port, method, path, body=None, request_headers=None,
     c = class_(host, port, strict=True, timeout=timeout)
 
     # TODO: We might have to modify this in future if we need to interact with
-    # how httplib.request handles Accept-Encoding and Host.
+    # how http.client.request handles Accept-Encoding and Host.
     c.request(method, path, body=body, headers=request_headers)
 
     res = c.getresponse()

diff --git a/ragweed/tests/tests.py b/ragweed/tests/tests.py
index c2363fd412621f2a2825770ec420dd148d3867f2..9198b21871669fad83efe8443f0a68dcfdba7506 100644 (file)
--- a/ragweed/tests/tests.py
+++ b/ragweed/tests/tests.py
@@ -1,4 +1,4 @@
-from cStringIO import StringIO
+from io import StringIO
 import ragweed.framework
 import binascii
 import string