openstack/python-glanceclient
Code Issues Proposed changes

Remove monkey-patching for getsockopt

Browse Source 
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
This commit is contained in:
kairat_kushaev
2016-01-15 16:29:27 +03:00
parent 0b7a6d2379
commit 799febf73e
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
glanceclient/common/https.py
View File

@@ -33,17 +33,12 @@ import six
# NOTE(jokke): simplified transition to py3, behaves like py2 xrange # NOTE(jokke): simplified transition to py3, behaves like py2 xrange
from six.moves import range from six.moves import range
from glanceclient.common import utils
try: try:
from eventlet import patcher from eventlet import patcher
# Handle case where we are running in a monkey patched environment # Handle case where we are running in a monkey patched environment
if patcher.is_monkey_patched('socket'): if patcher.is_monkey_patched('socket'):
from eventlet.green.httplib import HTTPSConnection from eventlet.green.httplib import HTTPSConnection
from eventlet.green.OpenSSL.SSL import GreenConnection as Connection 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: else:
raise ImportError raise ImportError
except ImportError: except ImportError: