449c90a509
This patch consists of the following changes:
* Splitting eventlet.greenio into base, py2 and py3 parts
(eventlet.greenio should be exporing the same public objects). This
change is motivated by the size and the number of conditions present
in the current greenio code
* Connected to the first point: implementing almost completely new
GreenPipe callable utilizing parts of old GreenPipe code but dropping
_fileobject/SocketIO inheritance in favour of io.FileIO and making use
of patched _pyio.open function which wraps raw file-like object in
various readers and writers (they take care of the buffering,
encoding/decoding etc.)
* Implementing (from scratch or updating existing versions)
green versions of the following modules:
* http.* (needed by Python 3's urllib)
* selectors (Python >= 3.4, used in subprocess module)
* urllib.* (needed by various tests and we were already exposing green
urllib)
* Modifying some tests to make tests pass, which includes:
* unicode/bytestring issues
* modifying wsgi_test_conntimeout.py to not pass bufsize and close
arguments to ExplodingSocketFile - on Python 3 it inherits from
SocketIO, which doesn't deal with buffering at all as far as I can
see
* Random cleaning up and reorganizing
* Requiring Python 3.x tests to pass for the whole build to pass
Known issues:
* code repetition
* naming inconsistencies
* possibly breaking some external code using private eventlet.greenio attributes
Closes https://github.com/eventlet/eventlet/issues/108
Affects https://github.com/eventlet/eventlet/issues/6 (I'd call it an
experimental support)
Should help for https://github.com/eventlet/eventlet/issues/145
Should help for https://github.com/eventlet/eventlet/issues/157
45 lines
1.2 KiB
Python
45 lines
1.2 KiB
Python
from eventlet import patcher
|
|
from eventlet.green import ftplib, os, socket, time
|
|
from eventlet.green.http import client as http_client
|
|
from eventlet.green.urllib import error, parse, response
|
|
|
|
# TODO should we also have green email version?
|
|
# import email
|
|
|
|
|
|
to_patch = [
|
|
('http.client', http_client),
|
|
('os', os),
|
|
('socket', socket),
|
|
('time', time),
|
|
('urllib.error', error),
|
|
('urllib.parse', parse),
|
|
('urllib.response', response),
|
|
]
|
|
|
|
try:
|
|
from eventlet.green import ssl
|
|
except ImportError:
|
|
pass
|
|
else:
|
|
to_patch.append(('ssl', ssl))
|
|
|
|
patcher.inject('urllib.request', globals(), *to_patch)
|
|
del to_patch
|
|
|
|
to_patch_in_functions = [('ftplib', ftplib)]
|
|
del ftplib
|
|
|
|
FTPHandler.ftp_open = patcher.patch_function(FTPHandler.ftp_open, *to_patch_in_functions)
|
|
URLopener.open_ftp = patcher.patch_function(URLopener.open_ftp, *to_patch_in_functions)
|
|
|
|
ftperrors = patcher.patch_function(ftperrors, *to_patch_in_functions)
|
|
|
|
ftpwrapper.init = patcher.patch_function(ftpwrapper.init, *to_patch_in_functions)
|
|
ftpwrapper.retrfile = patcher.patch_function(ftpwrapper.retrfile, *to_patch_in_functions)
|
|
|
|
del error
|
|
del parse
|
|
del response
|
|
del to_patch_in_functions
|