summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkairat_kushaev <kkushaev@mirantis.com>2016-01-15 16:29:27 +0300
committerkairat_kushaev <kkushaev@mirantis.com>2016-01-15 16:29:27 +0300
commit799febf73e03c3bddfcbef472aa5dcff051523a3 (patch)
treecf5d2577693778cc7c2e20b0cddd97c062fd33ec
parent0b7a6d2379981c1c0e08797ab44aa7272590d340 (diff)
downloadpython-glanceclient-799febf73e03c3bddfcbef472aa5dcff051523a3.tar.gz
Remove monkey-patching for getsockopt
Not getsocketopts is presented in GreenSocket for Linux. See the bug for the info. So we don't need to patch it anymore. Closes-Bug: #1348269 Change-Id: Ie2211238656eddfb0af5f3ef84ab638f6248a10a
-rw-r--r--glanceclient/common/https.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/glanceclient/common/https.py b/glanceclient/common/https.py
index 032cde7..d2991cd 100644
--- a/glanceclient/common/https.py
+++ b/glanceclient/common/https.py
@@ -33,17 +33,12 @@ import six
# NOTE(jokke): simplified transition to py3, behaves like py2 xrange
from six.moves import range
-from glanceclient.common import utils
-
try:
from eventlet import patcher
# Handle case where we are running in a monkey patched environment
if patcher.is_monkey_patched('socket'):
from eventlet.green.httplib import HTTPSConnection
from eventlet.green.OpenSSL.SSL import GreenConnection as Connection
- from eventlet.greenio import GreenSocket
- # TODO(mclaren): A getsockopt workaround: see 'getsockopt' doc string
- GreenSocket.getsockopt = utils.getsockopt
else:
raise ImportError
except ImportError: