summaryrefslogtreecommitdiff
path: root/swiftclient/client.py
diff options
context:
space:
mode:
Diffstat (limited to 'swiftclient/client.py')
-rw-r--r--swiftclient/client.py20
1 files changed, 2 insertions, 18 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py
index f934876..3bb7e3f 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -25,25 +25,9 @@ from functools import wraps
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")