diff options
| -rw-r--r-- | swiftclient/client.py | 20 | ||||
| -rw-r--r-- | tests/utils.py | 5 | ||||
| -rw-r--r-- | tools/test-requires | 1 |
3 files changed, 3 insertions, 23 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") diff --git a/tests/utils.py b/tests/utils.py index 4da8f3a..8b5fbb2 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 fake_http_connect(*code_iter, **kwargs): 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 c578877..66136b0 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -7,7 +7,6 @@ flake8==2.0 coverage discover -eventlet python-keystoneclient sphinx>=1.1.2 testrepository>=0.0.13 |