diff options
| author | Sergey Shepelev <temotor@gmail.com> | 2013-10-07 16:48:34 +0400 |
|---|---|---|
| committer | Sergey Shepelev <temotor@gmail.com> | 2013-12-03 22:36:29 +0400 |
| commit | d2bbbd79d3f903fbff59f09467af681d5b9282cf (patch) | |
| tree | 6a6da9b62894d62fdaa1050acbd39c46e710b9e8 /tests/stdlib | |
| parent | 35f600600c59c295fab0131c7bc0032e28b70045 (diff) | |
| download | eventlet-d2bbbd79d3f903fbff59f09467af681d5b9282cf.tar.gz | |
python3 compat: remove lots of Python 2.5 and earlier dependent code; use print() function syntax
Diffstat (limited to 'tests/stdlib')
| -rw-r--r-- | tests/stdlib/test_select.py | 8 | ||||
| -rw-r--r-- | tests/stdlib/test_thread.py | 8 | ||||
| -rw-r--r-- | tests/stdlib/test_urllib2.py | 5 |
3 files changed, 5 insertions, 16 deletions
diff --git a/tests/stdlib/test_select.py b/tests/stdlib/test_select.py index 1ec90ca..cb3ba07 100644 --- a/tests/stdlib/test_select.py +++ b/tests/stdlib/test_select.py @@ -1,12 +1,10 @@ from eventlet import patcher from eventlet.green import select + patcher.inject('test.test_select', globals(), ('select', select)) - + if __name__ == "__main__": - try: - test_main() - except NameError: - pass # 2.5
\ No newline at end of file + test_main() diff --git a/tests/stdlib/test_thread.py b/tests/stdlib/test_thread.py index 00b9279..1df908f 100644 --- a/tests/stdlib/test_thread.py +++ b/tests/stdlib/test_thread.py @@ -2,9 +2,6 @@ from eventlet import patcher from eventlet.green import thread from eventlet.green import time -# necessary to initialize the hub before running on 2.5 -from eventlet import hubs -hubs.get_hub() patcher.inject('test.test_thread', globals()) @@ -15,7 +12,4 @@ except NameError: pass if __name__ == "__main__": - try: - test_main() - except NameError: - pass # 2.5 + test_main() diff --git a/tests/stdlib/test_urllib2.py b/tests/stdlib/test_urllib2.py index ac172a7..912b45d 100644 --- a/tests/stdlib/test_urllib2.py +++ b/tests/stdlib/test_urllib2.py @@ -9,10 +9,7 @@ patcher.inject('test.test_urllib2', HandlerTests.test_file = patcher.patch_function(HandlerTests.test_file, ('socket', socket)) HandlerTests.test_cookie_redirect = patcher.patch_function(HandlerTests.test_cookie_redirect, ('urllib2', urllib2)) -try: - OpenerDirectorTests.test_badly_named_methods = patcher.patch_function(OpenerDirectorTests.test_badly_named_methods, ('urllib2', urllib2)) -except AttributeError: - pass # 2.4 doesn't have this test method +OpenerDirectorTests.test_badly_named_methods = patcher.patch_function(OpenerDirectorTests.test_badly_named_methods, ('urllib2', urllib2)) if __name__ == "__main__": test_main() |