diff --git a/eventlet/green/time.py b/eventlet/green/time.py index b9b97f7..0a54d3a 100644 --- a/eventlet/green/time.py +++ b/eventlet/green/time.py @@ -1,5 +1,5 @@ __time = __import__('time') -exec "\n".join(["%s = __time.%s" % (var, var) for var in dir(__time)]) +exec "\n".join("%s = __time.%s" % (var, var) for var in dir(__time)) __patched__ = ['sleep'] from eventlet.greenthread import sleep sleep # silence pyflakes diff --git a/tests/stdlib/test_asyncore.py b/tests/stdlib/test_asyncore.py index 0617c87..8ea2403 100644 --- a/tests/stdlib/test_asyncore.py +++ b/tests/stdlib/test_asyncore.py @@ -5,13 +5,7 @@ from eventlet.green import socket from eventlet.green import threading from eventlet.green import time -patcher.inject("test.test_asyncore", - globals(), - ('asyncore', asyncore), - ('select', select), - ('socket', socket), - ('threading', threading), - ('time', time)) +patcher.inject("test.test_asyncore", globals()) def new_closeall_check(self, usedefault): # Check that close_all() closes everything in a given map @@ -47,5 +41,9 @@ def new_closeall_check(self, usedefault): HelperFunctionTests.closeall_check = new_closeall_check +# Eventlet's select() emulation doesn't support the POLLPRI flag, +# which this test relies on. Therefore, nuke it! +BaseTestAPI.test_handle_expt = lambda *a, **kw: None + if __name__ == "__main__": - test_main() \ No newline at end of file + test_main()