diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
| commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /python/helpers/pydev/_pydev_imps/_pydev_socket.py | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
| download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'python/helpers/pydev/_pydev_imps/_pydev_socket.py')
| -rw-r--r-- | python/helpers/pydev/_pydev_imps/_pydev_socket.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/python/helpers/pydev/_pydev_imps/_pydev_socket.py b/python/helpers/pydev/_pydev_imps/_pydev_socket.py index 9e96e800876c..3d74e3b54ab4 100644 --- a/python/helpers/pydev/_pydev_imps/_pydev_socket.py +++ b/python/helpers/pydev/_pydev_imps/_pydev_socket.py @@ -1 +1,9 @@ -from socket import *
\ No newline at end of file +from socket import * + +try: + from gevent import monkey + saved = monkey.saved['socket'] + for key, val in saved.items(): + globals()[key] = val +except: + pass
\ No newline at end of file |