diff --git a/swiftclient/client.py b/swiftclient/client.py index bfd794c5..43f9c012 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -26,25 +26,9 @@ from urllib import quote as _quote from urlparse import urlparse, urlunparse +from httplib import HTTPException, HTTPConnection, HTTPSConnection +from time import sleep -try: - from eventlet.green.httplib import HTTPException, HTTPSConnection -except ImportError: - from httplib import HTTPException, HTTPSConnection - -try: - from eventlet import sleep -except ImportError: - from time import sleep - -try: - from swift.common.bufferedhttp \ - import BufferedHTTPConnection as HTTPConnection -except ImportError: - try: - from eventlet.green.httplib import HTTPConnection - except ImportError: - from httplib import HTTPConnection logger = logging.getLogger("swiftclient") diff --git a/tests/utils.py b/tests/utils.py index 4da8f3a2..8b5fbb27 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -13,8 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. from httplib import HTTPException - -from eventlet import Timeout, sleep +from time import sleep def fake_get_keystoneclient_2_0(os_options, exc=None, **kwargs): @@ -61,8 +60,6 @@ def __init__(self, status, etag=None, body='', timestamp='1'): def getresponse(self): if kwargs.get('raise_exc'): raise Exception('test') - if kwargs.get('raise_timeout_exc'): - raise Timeout() return self def getexpect(self): diff --git a/tools/test-requires b/tools/test-requires index ea2ca29e..7188859f 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -2,7 +2,6 @@ distribute>=0.6.24 coverage discover -eventlet pep8==1.3 python-keystoneclient sphinx>=1.1.2