From 358bd9258c2b6d2ee74de4dfd07a5123107abad4 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Tue, 15 Sep 2015 17:41:36 +0300 Subject: [PATCH] Add python-eventlet package to MOS 8.0 repository Change-Id: I107626b90de56c28a33eb470469f4635bea2acfc Version: 0.17.4-2~u14.04+mos1 Source: http://http.debian.net/debian/pool/main/p/python-eventlet/python-eventlet_0.17.4-2.dsc --- debian/changelog | 63 +- debian/control | 74 +- debian/copyright | 9 +- debian/gbp.conf | 8 + debian/links | 1 - debian/patches/enforce-tlsv1-always.patch | 18 + .../patches/fix-FTBFS-on-sphinx-build.patch | 4 +- .../fixed-privacy-breach-in-examples.patch | 30 + ...d_was_running_empty_loop_on_ENOTCONN.patch | 29 + ...self.assert-in-tests.patcher_test.py.patch | 10 +- debian/patches/series | 5 +- .../set-defaults-to-be-tlsv1-not-sslv23.patch | 17 + debian/patches/skip-failing-tests.patch | 10 - ...ged-python-mock-rather-than-embedded.patch | 10 +- ...{doc-base => python-eventlet-doc.doc-base} | 7 +- debian/{docs => python-eventlet-doc.docs} | 0 debian/rules | 21 +- eventlet/PKG-INFO | 85 -- eventlet/eventlet.egg-info/PKG-INFO | 85 -- eventlet/eventlet.egg-info/SOURCES.txt | 202 ----- .../eventlet.egg-info/dependency_links.txt | 1 - eventlet/eventlet.egg-info/not-zip-safe | 1 - eventlet/eventlet.egg-info/requires.txt | 1 - eventlet/eventlet.egg-info/top_level.txt | 2 - eventlet/eventlet/green/_socket_nodns.py | 87 -- eventlet/eventlet/green/urllib.py | 38 - eventlet/eventlet/support/greendns.py | 480 ----------- eventlet/eventlet/support/greenlets.py | 29 - eventlet/setup.cfg | 8 - eventlet/tests/greendns_test.py | 13 - eventlet/tests/mysqldb_test_monkey_patch.py | 12 - {eventlet => python-eventlet}/AUTHORS | 12 +- {eventlet => python-eventlet}/LICENSE | 0 {eventlet => python-eventlet}/MANIFEST.in | 0 {eventlet => python-eventlet}/NEWS | 33 +- {eventlet => python-eventlet}/README.rst | 5 +- python-eventlet/benchmarks/__init__.py | 26 + python-eventlet/benchmarks/context.py | 97 +++ python-eventlet/benchmarks/hub_timers.py | 46 + .../benchmarks/localhost_socket.py | 117 +++ python-eventlet/benchmarks/spawn.py | 86 ++ python-eventlet/benchmarks/spawn_plot.py | 101 +++ python-eventlet/bin/build-website.bash | 74 ++ python-eventlet/bin/release | 50 ++ {eventlet => python-eventlet}/doc/Makefile | 0 python-eventlet/doc/_templates/layout.html | 14 + {eventlet => python-eventlet}/doc/authors.rst | 0 .../doc/basic_usage.rst | 0 {eventlet => python-eventlet}/doc/common.txt | 0 {eventlet => python-eventlet}/doc/conf.py | 0 .../doc/design_patterns.rst | 0 .../doc/environment.rst | 0 .../doc/examples.rst | 0 {eventlet => python-eventlet}/doc/history.rst | 0 {eventlet => python-eventlet}/doc/hubs.rst | 0 .../doc/images/threading_illustration.png | Bin {eventlet => python-eventlet}/doc/index.rst | 0 python-eventlet/doc/make.bat | 112 +++ {eventlet => python-eventlet}/doc/modules.rst | 0 .../doc/modules/backdoor.rst | 0 .../doc/modules/corolocal.rst | 0 .../doc/modules/db_pool.rst | 0 .../doc/modules/debug.rst | 0 .../doc/modules/event.rst | 0 .../doc/modules/greenpool.rst | 0 .../doc/modules/greenthread.rst | 0 .../doc/modules/pools.rst | 0 .../doc/modules/queue.rst | 0 .../doc/modules/semaphore.rst | 0 .../doc/modules/timeout.rst | 0 .../doc/modules/websocket.rst | 0 .../doc/modules/wsgi.rst | 0 .../doc/modules/zmq.rst | 0 .../doc/patching.rst | 0 python-eventlet/doc/real_index.html | 181 ++++ {eventlet => python-eventlet}/doc/ssl.rst | 0 {eventlet => python-eventlet}/doc/testing.rst | 0 .../doc/threading.rst | 0 {eventlet => python-eventlet}/doc/zeromq.rst | 0 .../eventlet/__init__.py | 2 +- .../eventlet/backdoor.py | 0 .../eventlet/convenience.py | 0 .../eventlet/corolocal.py | 0 .../eventlet/coros.py | 0 .../eventlet/db_pool.py | 0 .../eventlet/debug.py | 0 .../eventlet/event.py | 2 +- .../eventlet/green/BaseHTTPServer.py | 0 .../eventlet/green/CGIHTTPServer.py | 0 .../eventlet/green/MySQLdb.py | 0 .../eventlet/green/OpenSSL/SSL.py | 0 .../eventlet/green/OpenSSL/__init__.py | 0 .../eventlet/green/OpenSSL/crypto.py | 0 .../eventlet/green/OpenSSL/rand.py | 0 .../eventlet/green/OpenSSL/tsafe.py | 0 .../eventlet/green/OpenSSL/version.py | 0 .../eventlet/green/Queue.py | 0 .../eventlet/green/SimpleHTTPServer.py | 0 .../eventlet/green/SocketServer.py | 0 .../eventlet/green/__init__.py | 0 .../eventlet/green/_socket_nodns.py | 31 + .../eventlet/green/asynchat.py | 0 .../eventlet/green/asyncore.py | 0 .../eventlet/green/builtin.py | 0 .../eventlet/green/ftplib.py | 0 .../eventlet/green/http/__init__.py | 2 + python-eventlet/eventlet/green/http/client.py | 9 + .../eventlet/green/http/cookiejar.py | 13 + .../eventlet/green/http/cookies.py | 7 + python-eventlet/eventlet/green/http/server.py | 17 + .../eventlet/green/httplib.py | 0 .../eventlet/green/os.py | 0 .../eventlet/green/profile.py | 0 .../eventlet/green/select.py | 0 python-eventlet/eventlet/green/selectors.py | 11 + .../eventlet/green/socket.py | 10 +- .../eventlet/green/ssl.py | 19 +- .../eventlet/green/subprocess.py | 12 +- .../eventlet/green/thread.py | 24 + .../eventlet/green/threading.py | 0 .../eventlet/green/time.py | 0 .../eventlet/green/urllib/__init__.py | 40 + .../eventlet/green/urllib/error.py | 4 + .../eventlet/green/urllib/parse.py | 3 + .../eventlet/green/urllib/request.py | 44 + .../eventlet/green/urllib/response.py | 3 + .../eventlet/green/urllib2.py | 0 .../eventlet/green/zmq.py | 2 +- python-eventlet/eventlet/greenio/__init__.py | 8 + .../eventlet/greenio/base.py | 228 +---- python-eventlet/eventlet/greenio/py2.py | 226 +++++ python-eventlet/eventlet/greenio/py3.py | 192 +++++ .../eventlet/greenpool.py | 0 .../eventlet/greenthread.py | 0 .../eventlet/hubs/__init__.py | 0 .../eventlet/hubs/epolls.py | 0 .../eventlet/hubs/hub.py | 0 .../eventlet/hubs/kqueue.py | 0 .../eventlet/hubs/poll.py | 0 .../eventlet/hubs/pyevent.py | 0 .../eventlet/hubs/selects.py | 0 .../eventlet/hubs/timer.py | 0 .../eventlet/patcher.py | 28 +- .../eventlet/pools.py | 0 .../eventlet/queue.py | 0 .../eventlet/semaphore.py | 40 +- .../eventlet/support/__init__.py | 0 python-eventlet/eventlet/support/greendns.py | 723 ++++++++++++++++ python-eventlet/eventlet/support/greenlets.py | 8 + .../eventlet/support/psycopg2_patcher.py | 0 .../eventlet/support/pylib.py | 0 .../eventlet/support/six.py | 0 .../eventlet/support/stacklesspypys.py | 0 .../eventlet/support/stacklesss.py | 0 .../eventlet/timeout.py | 0 .../eventlet/tpool.py | 10 + .../eventlet/websocket.py | 0 .../eventlet/wsgi.py | 84 +- .../examples/chat_bridge.py | 0 .../examples/chat_server.py | 0 .../examples/connect.py | 0 .../examples/distributed_websocket_chat.py | 0 .../examples/echoserver.py | 0 .../examples/feedscraper-testclient.py | 0 .../examples/feedscraper.py | 0 .../examples/forwarder.py | 0 .../examples/producer_consumer.py | 0 .../examples/recursive_crawler.py | 0 .../examples/webcrawler.py | 0 .../examples/websocket.html | 0 .../examples/websocket.py | 0 .../examples/websocket_chat.html | 0 .../examples/websocket_chat.py | 0 .../examples/wsgi.py | 0 .../examples/zmq_chat.py | 0 .../examples/zmq_simple.py | 0 python-eventlet/setup.cfg | 2 + {eventlet => python-eventlet}/setup.py | 4 +- python-eventlet/tests/README | 7 + .../tests/__init__.py | 92 +- .../tests/api_test.py | 2 +- .../tests/backdoor_test.py | 0 .../tests/convenience_test.py | 0 .../tests/db_pool_test.py | 0 .../tests/debug_test.py | 0 .../tests/env_test.py | 0 .../tests/event_test.py | 0 .../tests/fork_test.py | 0 python-eventlet/tests/greendns_test.py | 810 ++++++++++++++++++ .../tests/greenio_test.py | 81 +- .../tests/greenpipe_test_with_statement.py | 0 .../tests/greenpool_test.py | 2 +- .../tests/greenthread_test.py | 0 .../tests/hub_test.py | 13 +- .../tests/hub_test_fork.py | 0 .../tests/isolated}/__init__.py | 0 .../isolated/greendns_from_address_203.py | 16 + .../isolated/greenio_double_close_219.py | 22 + .../tests/isolated/mysqldb_monkey_patch.py | 14 + .../tests/isolated/patcher_importlib_lock.py | 2 +- .../isolated/patcher_threading_condition.py | 23 + .../tests/isolated/patcher_threading_join.py | 23 + .../tests/isolated/wsgi_connection_timeout.py | 143 ++-- python-eventlet/tests/manual/__init__.py | 0 .../tests/manual/greenio_memtest.py | 0 .../tests/manual/regress-226-unpatched-ssl.py | 3 + {eventlet => python-eventlet}/tests/mock.py | 2 +- .../tests/mysqldb_test.py | 22 +- .../tests/nosewrapper.py | 0 .../tests/parse_results.py | 0 .../tests/patcher_psycopg_test.py | 0 .../tests/patcher_test.py | 37 +- .../tests/pools_test.py | 0 .../tests/queue_test.py | 0 .../tests/semaphore_test.py | 21 +- .../tests/socket_test.py | 0 .../tests/ssl_test.py | 0 .../tests/stdlib/all.py | 0 .../tests/stdlib/all_modules.py | 0 .../tests/stdlib/all_monkey.py | 0 .../tests/stdlib/test_SimpleHTTPServer.py | 0 .../tests/stdlib/test_asynchat.py | 0 .../tests/stdlib/test_asyncore.py | 0 .../tests/stdlib/test_ftplib.py | 0 .../tests/stdlib/test_httplib.py | 0 .../tests/stdlib/test_httpservers.py | 0 .../tests/stdlib/test_os.py | 0 .../tests/stdlib/test_queue.py | 0 .../tests/stdlib/test_select.py | 0 .../tests/stdlib/test_socket.py | 0 .../tests/stdlib/test_socket_ssl.py | 0 .../tests/stdlib/test_socketserver.py | 0 .../tests/stdlib/test_ssl.py | 0 .../tests/stdlib/test_subprocess.py | 0 .../tests/stdlib/test_thread.py | 0 .../tests/stdlib/test_thread__boundedsem.py | 0 .../tests/stdlib/test_threading.py | 0 .../tests/stdlib/test_threading_local.py | 0 .../tests/stdlib/test_timeout.py | 0 .../tests/stdlib/test_urllib.py | 0 .../tests/stdlib/test_urllib2.py | 0 .../tests/stdlib/test_urllib2_localnet.py | 0 .../tests/subprocess_test.py | 27 +- .../tests/test__event.py | 0 .../tests/test__greenness.py | 15 +- .../tests/test__refcount.py | 0 .../tests/test__socket_errors.py | 10 + .../tests/test_server.crt | 0 .../tests/test_server.key | 0 .../tests/thread_test.py | 0 .../tests/timeout_test.py | 0 .../tests/timeout_test_with_statement.py | 0 .../tests/timer_test.py | 0 .../tests/tpool_test.py | 18 +- .../tests/websocket_new_test.py | 9 +- .../tests/websocket_test.py | 0 .../tests/wsgi_test.py | 48 +- .../tests/zmq_test.py | 0 python-eventlet/tox.ini | 55 ++ 259 files changed, 4037 insertions(+), 1602 deletions(-) create mode 100644 debian/gbp.conf delete mode 100644 debian/links create mode 100644 debian/patches/enforce-tlsv1-always.patch create mode 100644 debian/patches/fixed-privacy-breach-in-examples.patch create mode 100644 debian/patches/greenio_send_was_running_empty_loop_on_ENOTCONN.patch create mode 100644 debian/patches/set-defaults-to-be-tlsv1-not-sslv23.patch delete mode 100644 debian/patches/skip-failing-tests.patch rename debian/{doc-base => python-eventlet-doc.doc-base} (50%) rename debian/{docs => python-eventlet-doc.docs} (100%) delete mode 100644 eventlet/PKG-INFO delete mode 100644 eventlet/eventlet.egg-info/PKG-INFO delete mode 100644 eventlet/eventlet.egg-info/SOURCES.txt delete mode 100644 eventlet/eventlet.egg-info/dependency_links.txt delete mode 100644 eventlet/eventlet.egg-info/not-zip-safe delete mode 100644 eventlet/eventlet.egg-info/requires.txt delete mode 100644 eventlet/eventlet.egg-info/top_level.txt delete mode 100644 eventlet/eventlet/green/_socket_nodns.py delete mode 100644 eventlet/eventlet/green/urllib.py delete mode 100644 eventlet/eventlet/support/greendns.py delete mode 100644 eventlet/eventlet/support/greenlets.py delete mode 100644 eventlet/setup.cfg delete mode 100644 eventlet/tests/greendns_test.py delete mode 100644 eventlet/tests/mysqldb_test_monkey_patch.py rename {eventlet => python-eventlet}/AUTHORS (88%) rename {eventlet => python-eventlet}/LICENSE (100%) rename {eventlet => python-eventlet}/MANIFEST.in (100%) rename {eventlet => python-eventlet}/NEWS (95%) rename {eventlet => python-eventlet}/README.rst (94%) create mode 100644 python-eventlet/benchmarks/__init__.py create mode 100644 python-eventlet/benchmarks/context.py create mode 100644 python-eventlet/benchmarks/hub_timers.py create mode 100644 python-eventlet/benchmarks/localhost_socket.py create mode 100644 python-eventlet/benchmarks/spawn.py create mode 100644 python-eventlet/benchmarks/spawn_plot.py create mode 100755 python-eventlet/bin/build-website.bash create mode 100755 python-eventlet/bin/release rename {eventlet => python-eventlet}/doc/Makefile (100%) create mode 100644 python-eventlet/doc/_templates/layout.html rename {eventlet => python-eventlet}/doc/authors.rst (100%) rename {eventlet => python-eventlet}/doc/basic_usage.rst (100%) rename {eventlet => python-eventlet}/doc/common.txt (100%) rename {eventlet => python-eventlet}/doc/conf.py (100%) rename {eventlet => python-eventlet}/doc/design_patterns.rst (100%) rename {eventlet => python-eventlet}/doc/environment.rst (100%) rename {eventlet => python-eventlet}/doc/examples.rst (100%) rename {eventlet => python-eventlet}/doc/history.rst (100%) rename {eventlet => python-eventlet}/doc/hubs.rst (100%) rename {eventlet => python-eventlet}/doc/images/threading_illustration.png (100%) rename {eventlet => python-eventlet}/doc/index.rst (100%) create mode 100644 python-eventlet/doc/make.bat rename {eventlet => python-eventlet}/doc/modules.rst (100%) rename {eventlet => python-eventlet}/doc/modules/backdoor.rst (100%) rename {eventlet => python-eventlet}/doc/modules/corolocal.rst (100%) rename {eventlet => python-eventlet}/doc/modules/db_pool.rst (100%) rename {eventlet => python-eventlet}/doc/modules/debug.rst (100%) rename {eventlet => python-eventlet}/doc/modules/event.rst (100%) rename {eventlet => python-eventlet}/doc/modules/greenpool.rst (100%) rename {eventlet => python-eventlet}/doc/modules/greenthread.rst (100%) rename {eventlet => python-eventlet}/doc/modules/pools.rst (100%) rename {eventlet => python-eventlet}/doc/modules/queue.rst (100%) rename {eventlet => python-eventlet}/doc/modules/semaphore.rst (100%) rename {eventlet => python-eventlet}/doc/modules/timeout.rst (100%) rename {eventlet => python-eventlet}/doc/modules/websocket.rst (100%) rename {eventlet => python-eventlet}/doc/modules/wsgi.rst (100%) rename {eventlet => python-eventlet}/doc/modules/zmq.rst (100%) rename {eventlet => python-eventlet}/doc/patching.rst (100%) create mode 100644 python-eventlet/doc/real_index.html rename {eventlet => python-eventlet}/doc/ssl.rst (100%) rename {eventlet => python-eventlet}/doc/testing.rst (100%) rename {eventlet => python-eventlet}/doc/threading.rst (100%) rename {eventlet => python-eventlet}/doc/zeromq.rst (100%) rename {eventlet => python-eventlet}/eventlet/__init__.py (98%) rename {eventlet => python-eventlet}/eventlet/backdoor.py (100%) rename {eventlet => python-eventlet}/eventlet/convenience.py (100%) rename {eventlet => python-eventlet}/eventlet/corolocal.py (100%) rename {eventlet => python-eventlet}/eventlet/coros.py (100%) rename {eventlet => python-eventlet}/eventlet/db_pool.py (100%) rename {eventlet => python-eventlet}/eventlet/debug.py (100%) rename {eventlet => python-eventlet}/eventlet/event.py (99%) rename {eventlet => python-eventlet}/eventlet/green/BaseHTTPServer.py (100%) rename {eventlet => python-eventlet}/eventlet/green/CGIHTTPServer.py (100%) rename {eventlet => python-eventlet}/eventlet/green/MySQLdb.py (100%) rename {eventlet => python-eventlet}/eventlet/green/OpenSSL/SSL.py (100%) rename {eventlet => python-eventlet}/eventlet/green/OpenSSL/__init__.py (100%) rename {eventlet => python-eventlet}/eventlet/green/OpenSSL/crypto.py (100%) rename {eventlet => python-eventlet}/eventlet/green/OpenSSL/rand.py (100%) rename {eventlet => python-eventlet}/eventlet/green/OpenSSL/tsafe.py (100%) rename {eventlet => python-eventlet}/eventlet/green/OpenSSL/version.py (100%) rename {eventlet => python-eventlet}/eventlet/green/Queue.py (100%) rename {eventlet => python-eventlet}/eventlet/green/SimpleHTTPServer.py (100%) rename {eventlet => python-eventlet}/eventlet/green/SocketServer.py (100%) rename {eventlet => python-eventlet}/eventlet/green/__init__.py (100%) create mode 100644 python-eventlet/eventlet/green/_socket_nodns.py rename {eventlet => python-eventlet}/eventlet/green/asynchat.py (100%) rename {eventlet => python-eventlet}/eventlet/green/asyncore.py (100%) rename {eventlet => python-eventlet}/eventlet/green/builtin.py (100%) rename {eventlet => python-eventlet}/eventlet/green/ftplib.py (100%) create mode 100644 python-eventlet/eventlet/green/http/__init__.py create mode 100644 python-eventlet/eventlet/green/http/client.py create mode 100644 python-eventlet/eventlet/green/http/cookiejar.py create mode 100644 python-eventlet/eventlet/green/http/cookies.py create mode 100644 python-eventlet/eventlet/green/http/server.py rename {eventlet => python-eventlet}/eventlet/green/httplib.py (100%) rename {eventlet => python-eventlet}/eventlet/green/os.py (100%) rename {eventlet => python-eventlet}/eventlet/green/profile.py (100%) rename {eventlet => python-eventlet}/eventlet/green/select.py (100%) create mode 100644 python-eventlet/eventlet/green/selectors.py rename {eventlet => python-eventlet}/eventlet/green/socket.py (92%) rename {eventlet => python-eventlet}/eventlet/green/ssl.py (95%) rename {eventlet => python-eventlet}/eventlet/green/subprocess.py (93%) rename {eventlet => python-eventlet}/eventlet/green/thread.py (68%) rename {eventlet => python-eventlet}/eventlet/green/threading.py (100%) rename {eventlet => python-eventlet}/eventlet/green/time.py (100%) create mode 100644 python-eventlet/eventlet/green/urllib/__init__.py create mode 100644 python-eventlet/eventlet/green/urllib/error.py create mode 100644 python-eventlet/eventlet/green/urllib/parse.py create mode 100644 python-eventlet/eventlet/green/urllib/request.py create mode 100644 python-eventlet/eventlet/green/urllib/response.py rename {eventlet => python-eventlet}/eventlet/green/urllib2.py (100%) rename {eventlet => python-eventlet}/eventlet/green/zmq.py (99%) create mode 100644 python-eventlet/eventlet/greenio/__init__.py rename eventlet/eventlet/greenio.py => python-eventlet/eventlet/greenio/base.py (71%) create mode 100644 python-eventlet/eventlet/greenio/py2.py create mode 100644 python-eventlet/eventlet/greenio/py3.py rename {eventlet => python-eventlet}/eventlet/greenpool.py (100%) rename {eventlet => python-eventlet}/eventlet/greenthread.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/__init__.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/epolls.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/hub.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/kqueue.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/poll.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/pyevent.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/selects.py (100%) rename {eventlet => python-eventlet}/eventlet/hubs/timer.py (100%) rename {eventlet => python-eventlet}/eventlet/patcher.py (94%) rename {eventlet => python-eventlet}/eventlet/pools.py (100%) rename {eventlet => python-eventlet}/eventlet/queue.py (100%) rename {eventlet => python-eventlet}/eventlet/semaphore.py (90%) rename {eventlet => python-eventlet}/eventlet/support/__init__.py (100%) create mode 100644 python-eventlet/eventlet/support/greendns.py create mode 100644 python-eventlet/eventlet/support/greenlets.py rename {eventlet => python-eventlet}/eventlet/support/psycopg2_patcher.py (100%) rename {eventlet => python-eventlet}/eventlet/support/pylib.py (100%) rename {eventlet => python-eventlet}/eventlet/support/six.py (100%) rename {eventlet => python-eventlet}/eventlet/support/stacklesspypys.py (100%) rename {eventlet => python-eventlet}/eventlet/support/stacklesss.py (100%) rename {eventlet => python-eventlet}/eventlet/timeout.py (100%) rename {eventlet => python-eventlet}/eventlet/tpool.py (97%) rename {eventlet => python-eventlet}/eventlet/websocket.py (100%) rename {eventlet => python-eventlet}/eventlet/wsgi.py (94%) rename {eventlet => python-eventlet}/examples/chat_bridge.py (100%) rename {eventlet => python-eventlet}/examples/chat_server.py (100%) rename {eventlet => python-eventlet}/examples/connect.py (100%) rename {eventlet => python-eventlet}/examples/distributed_websocket_chat.py (100%) rename {eventlet => python-eventlet}/examples/echoserver.py (100%) rename {eventlet => python-eventlet}/examples/feedscraper-testclient.py (100%) rename {eventlet => python-eventlet}/examples/feedscraper.py (100%) rename {eventlet => python-eventlet}/examples/forwarder.py (100%) rename {eventlet => python-eventlet}/examples/producer_consumer.py (100%) rename {eventlet => python-eventlet}/examples/recursive_crawler.py (100%) rename {eventlet => python-eventlet}/examples/webcrawler.py (100%) rename {eventlet => python-eventlet}/examples/websocket.html (100%) rename {eventlet => python-eventlet}/examples/websocket.py (100%) rename {eventlet => python-eventlet}/examples/websocket_chat.html (100%) rename {eventlet => python-eventlet}/examples/websocket_chat.py (100%) rename {eventlet => python-eventlet}/examples/wsgi.py (100%) rename {eventlet => python-eventlet}/examples/zmq_chat.py (100%) rename {eventlet => python-eventlet}/examples/zmq_simple.py (100%) create mode 100644 python-eventlet/setup.cfg rename {eventlet => python-eventlet}/setup.py (86%) create mode 100644 python-eventlet/tests/README rename {eventlet => python-eventlet}/tests/__init__.py (82%) rename {eventlet => python-eventlet}/tests/api_test.py (99%) rename {eventlet => python-eventlet}/tests/backdoor_test.py (100%) rename {eventlet => python-eventlet}/tests/convenience_test.py (100%) rename {eventlet => python-eventlet}/tests/db_pool_test.py (100%) rename {eventlet => python-eventlet}/tests/debug_test.py (100%) rename {eventlet => python-eventlet}/tests/env_test.py (100%) rename {eventlet => python-eventlet}/tests/event_test.py (100%) rename {eventlet => python-eventlet}/tests/fork_test.py (100%) create mode 100644 python-eventlet/tests/greendns_test.py rename {eventlet => python-eventlet}/tests/greenio_test.py (94%) rename {eventlet => python-eventlet}/tests/greenpipe_test_with_statement.py (100%) rename {eventlet => python-eventlet}/tests/greenpool_test.py (99%) rename {eventlet => python-eventlet}/tests/greenthread_test.py (100%) rename {eventlet => python-eventlet}/tests/hub_test.py (98%) rename {eventlet => python-eventlet}/tests/hub_test_fork.py (100%) rename {eventlet/tests/manual => python-eventlet/tests/isolated}/__init__.py (100%) create mode 100644 python-eventlet/tests/isolated/greendns_from_address_203.py create mode 100644 python-eventlet/tests/isolated/greenio_double_close_219.py create mode 100644 python-eventlet/tests/isolated/mysqldb_monkey_patch.py rename eventlet/tests/patcher_test_importlib_lock.py => python-eventlet/tests/isolated/patcher_importlib_lock.py (96%) create mode 100644 python-eventlet/tests/isolated/patcher_threading_condition.py create mode 100644 python-eventlet/tests/isolated/patcher_threading_join.py rename eventlet/tests/wsgi_test_conntimeout.py => python-eventlet/tests/isolated/wsgi_connection_timeout.py (53%) create mode 100644 python-eventlet/tests/manual/__init__.py rename {eventlet => python-eventlet}/tests/manual/greenio_memtest.py (100%) create mode 100644 python-eventlet/tests/manual/regress-226-unpatched-ssl.py rename {eventlet => python-eventlet}/tests/mock.py (99%) rename {eventlet => python-eventlet}/tests/mysqldb_test.py (91%) rename {eventlet => python-eventlet}/tests/nosewrapper.py (100%) rename {eventlet => python-eventlet}/tests/parse_results.py (100%) rename {eventlet => python-eventlet}/tests/patcher_psycopg_test.py (100%) rename {eventlet => python-eventlet}/tests/patcher_test.py (96%) rename {eventlet => python-eventlet}/tests/pools_test.py (100%) rename {eventlet => python-eventlet}/tests/queue_test.py (100%) rename {eventlet => python-eventlet}/tests/semaphore_test.py (74%) rename {eventlet => python-eventlet}/tests/socket_test.py (100%) rename {eventlet => python-eventlet}/tests/ssl_test.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/all.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/all_modules.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/all_monkey.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_SimpleHTTPServer.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_asynchat.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_asyncore.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_ftplib.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_httplib.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_httpservers.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_os.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_queue.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_select.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_socket.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_socket_ssl.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_socketserver.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_ssl.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_subprocess.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_thread.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_thread__boundedsem.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_threading.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_threading_local.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_timeout.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_urllib.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_urllib2.py (100%) rename {eventlet => python-eventlet}/tests/stdlib/test_urllib2_localnet.py (100%) rename {eventlet => python-eventlet}/tests/subprocess_test.py (72%) rename {eventlet => python-eventlet}/tests/test__event.py (100%) rename {eventlet => python-eventlet}/tests/test__greenness.py (79%) rename {eventlet => python-eventlet}/tests/test__refcount.py (100%) rename {eventlet => python-eventlet}/tests/test__socket_errors.py (87%) rename {eventlet => python-eventlet}/tests/test_server.crt (100%) rename {eventlet => python-eventlet}/tests/test_server.key (100%) rename {eventlet => python-eventlet}/tests/thread_test.py (100%) rename {eventlet => python-eventlet}/tests/timeout_test.py (100%) rename {eventlet => python-eventlet}/tests/timeout_test_with_statement.py (100%) rename {eventlet => python-eventlet}/tests/timer_test.py (100%) rename {eventlet => python-eventlet}/tests/tpool_test.py (96%) rename {eventlet => python-eventlet}/tests/websocket_new_test.py (97%) rename {eventlet => python-eventlet}/tests/websocket_test.py (100%) rename {eventlet => python-eventlet}/tests/wsgi_test.py (98%) rename {eventlet => python-eventlet}/tests/zmq_test.py (100%) create mode 100644 python-eventlet/tox.ini diff --git a/debian/changelog b/debian/changelog index f82738a..2eee87a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,32 +1,59 @@ -python-eventlet (0.16.1-1~u14.04+mos1) mos7.0; urgency=medium +python-eventlet (0.17.4-2~u14.04+mos1) mos8.0; urgency=medium - * python-eventlet 0.16.1 is needed according to Kilo requirements - https://github.com/openstack/requirements/blob/stable/kilo/global-requirements.txt#L31 - * Sources are from https://launchpad.net/ubuntu/+source/python-eventlet/0.16.1-0ubuntu1 + * Source: http://http.debian.net/debian/pool/main/p/python-eventlet/python-eventlet_0.17.4-2.dsc - -- Daniil Trishkin Thu, 16 Apr 2015 19:25:49 +0300 + -- Ivan Udovichenko Tue, 15 Sep 2015 17:41:33 +0300 -python-eventlet (0.15.2-1~u14.04+mos1) mos6.1; urgency=medium +python-eventlet (0.17.4-2) unstable; urgency=medium - * Adjust the package revision according to the versioning policy - stated in the separate-mos-from-linux blueprint. + * Added greenio_send_was_running_empty_loop_on_ENOTCONN.patch. - -- Alexei Sheplyakov Thu, 09 Apr 2015 14:14:45 +0300 + -- Thomas Goirand Wed, 27 May 2015 21:33:41 +0000 -python-eventlet (0.15.2-1ubuntu1~mos6.1+1) trusty; urgency=medium +python-eventlet (0.17.4-1) unstable; urgency=medium - * Backport to Ubuntu 14.04 to satisfy OpenStack Juno global requirements - (only versions 0.15.[12] are good enough). - * Added a patch which fixes ENOTCONN handling and prevents services from - hogging CPU when rsyslogd gets restarted. + * New upstream release. + * Switched to PKG OpenStack team: + - Updated Maintainer:. + - Fixed VCS URLs (now using Git). + - Added openstack-pkg-tools as build-depends. + - Filled upstream VCS URL in debian/rules. + * Updated debian/copyright. + * Added dh-python as build-depends. + * Ran wrap-and-sort -t -a. + * Removed version for python-greenlet build-depends (the required version is + even available in Wheezy, and Jessie is out...). + * Removed privacy breach in example/websocket*.html + * Removed duplicate doc-base registration. + + -- Thomas Goirand Wed, 27 May 2015 14:01:28 +0200 + +python-eventlet (0.17.3-4) unstable; urgency=medium + + * Enforce default protocol to be TLSv1 and not SSLv23. + + -- Thomas Goirand Thu, 21 May 2015 17:20:12 +0000 + +python-eventlet (0.17.3-3) unstable; urgency=medium - -- Alexei Sheplyakov Fri, 13 Feb 2015 16:22:37 +0300 + * Enforce TLSv1 always, instead of the more permissive SSLv23. + * Standards-Version bumped to 3.9.6. -python-eventlet (0.15.2-1ubuntu1) vivid; urgency=medium + -- Thomas Goirand Thu, 21 May 2015 17:09:29 +0000 - * debian/control: python-zmq is optional +python-eventlet (0.17.3-2) unstable; urgency=medium + + * Activates --with python3 which was missing. + + -- Thomas Goirand Sat, 09 May 2015 20:58:47 +0000 + +python-eventlet (0.17.3-1) unstable; urgency=medium + + * New upstream release. + * Uploading to unstable. + * Added Python 3 package, since upstream has it now. - -- Chuck Short Thu, 13 Nov 2014 08:49:43 -0500 + -- Thomas Goirand Sun, 08 Feb 2015 12:34:57 +0000 python-eventlet (0.15.2-1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 54d0b6f..821eb1a 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,39 @@ Source: python-eventlet Section: python Priority: optional -Maintainer: Mirantis OpenStack Team +Maintainer: PKG OpenStack +Uploaders: Laszlo Boszormenyi (GCS) , + Thomas Goirand , Build-Depends: debhelper (>= 9), - python-all (>= 2.7.1), + dh-python, + openstack-pkg-tools, + python-all, python-setuptools, - python-sphinx (>= 1.0.7+dfsg) -Build-Depends-Indep: python-greenlet (>= 0.3.1-2.1), + python-sphinx, + python3-all, + python3-setuptools, +Build-Depends-Indep: python-greenlet, python-httplib2, python-mock, python-nose, - python-openssl -Standards-Version: 3.9.5 + python-openssl, + python-zmq, + python3-greenlet, + python3-httplib2, + python3-mock, + python3-nose, + python3-openssl, + python3-zmq, +Standards-Version: 3.9.6 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-eventlet.git;a=summary +Vcs-Git: git://anonscm.debian.org/openstack/python-eventlet.git Homepage: http://eventlet.net Package: python-eventlet Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends} +Depends: python-greenlet, + ${misc:Depends}, + ${python:Depends}, Description: concurrent networking library - Python 2.x Eventlet allows you to change how you run your code, not how you write it. . @@ -31,3 +48,46 @@ Description: concurrent networking library - Python 2.x patterns, and the list of the basic API primitives. . This package provides the Python 2.x module. + +Package: python3-eventlet +Architecture: all +Depends: python3-greenlet, + ${misc:Depends}, + ${python3:Depends}, + ${sphinxdoc:Depends}, +Description: concurrent networking library - Python 3.x + Eventlet allows you to change how you run your code, not how you write it. + . + It uses epoll or libevent for highly scalable non-blocking I/O. + Coroutines ensure that the developer uses a blocking style of programming + that is similar to threading, but provide the benefits of non-blocking I/O. + The event dispatch is implicit, which means you can easily use Eventlet from + the Python interpreter, or as a small part of a larger application. + . + It's easy to get started using Eventlet, and easy to convert existing + applications to use it. Start off by looking at examples, common design + patterns, and the list of the basic API primitives. + . + This package provides the Python 3.x module. + +Package: python-eventlet-doc +Architecture: all +Section: doc +Breaks: python-eventlet (<< 0.17.4) +Replaces: python-eventlet (<< 0.17.4) +Depends: ${misc:Depends}, + ${sphinxdoc:Depends}, +Description: concurrent networking library - doc + Eventlet allows you to change how you run your code, not how you write it. + . + It uses epoll or libevent for highly scalable non-blocking I/O. + Coroutines ensure that the developer uses a blocking style of programming + that is similar to threading, but provide the benefits of non-blocking I/O. + The event dispatch is implicit, which means you can easily use Eventlet from + the Python interpreter, or as a small part of a larger application. + . + It's easy to get started using Eventlet, and easy to convert existing + applications to use it. Start off by looking at examples, common design + patterns, and the list of the basic API primitives. + . + This package provides the documentation. diff --git a/debian/copyright b/debian/copyright index 3fc56b6..4af787c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -101,10 +101,11 @@ License: voidspace-bsd OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: debian/* -Copyright: - 2010, Monty Taylor - 2010-2011, Soren Hansen - 2011-2012, Stefano Rivera +Copyright: (c) 2010, Monty Taylor + (c) 2010-2011, Soren Hansen + (c) 2011-2012, Stefano Rivera + (c) 2013-2015, Thomas Goirand + (c) 2012-2013, Laszlo Boszormenyi (GCS) License: generic-bsd License: generic-bsd diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..7bf5959 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +upstream-branch = master +debian-branch = debian/unstable +upstream-tag = %(version)s +compression = xz + +[buildpackage] +export-dir = ../build-area/ diff --git a/debian/links b/debian/links deleted file mode 100644 index 5a81f86..0000000 --- a/debian/links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/doc/python-eventlet/html/_sources /usr/share/doc/python-eventlet/rst diff --git a/debian/patches/enforce-tlsv1-always.patch b/debian/patches/enforce-tlsv1-always.patch new file mode 100644 index 0000000..4616a7c --- /dev/null +++ b/debian/patches/enforce-tlsv1-always.patch @@ -0,0 +1,18 @@ +Description: Always enforce TLSv1 + Upstream allows SSLv23, but we don't want this, we want TLSv1 always, as + we shouldn't trust lower types of crypto. +Author: Thomas Goirand +Forwarded: not-needed +Last-Update: 2015-05-21 + +--- python-eventlet-0.17.3.orig/eventlet/convenience.py ++++ python-eventlet-0.17.3/eventlet/convenience.py +@@ -139,7 +139,7 @@ except ImportError: + do_handshake_on_connect=True, + suppress_ragged_eofs=True, ciphers=None): + # theoretically the ssl_version could be respected in this line +- context = SSL.Context(SSL.SSLv23_METHOD) ++ context = SSL.Context(SSL.TLSv1_METHOD) + if certfile is not None: + context.use_certificate_file(certfile) + if keyfile is not None: diff --git a/debian/patches/fix-FTBFS-on-sphinx-build.patch b/debian/patches/fix-FTBFS-on-sphinx-build.patch index 0de8e15..8076991 100644 --- a/debian/patches/fix-FTBFS-on-sphinx-build.patch +++ b/debian/patches/fix-FTBFS-on-sphinx-build.patch @@ -2,8 +2,8 @@ Description: Removes line that is doing FTBFS in doc Author: Thomas Goirand Forwarded: no ---- a/doc/modules/zmq.rst -+++ b/doc/modules/zmq.rst +--- python-eventlet-0.13.0.orig/doc/modules/zmq.rst ++++ python-eventlet-0.13.0/doc/modules/zmq.rst @@ -15,7 +15,6 @@ .. autoclass:: Socket diff --git a/debian/patches/fixed-privacy-breach-in-examples.patch b/debian/patches/fixed-privacy-breach-in-examples.patch new file mode 100644 index 0000000..e714d98 --- /dev/null +++ b/debian/patches/fixed-privacy-breach-in-examples.patch @@ -0,0 +1,30 @@ +Description: Fixed privacy breach in examples + Upstream is referencing external websites, we don't allow this. +Author: Thomas Goirand +Forwarded: no +Last-Update: 2015-05-27 + +--- python-eventlet-0.17.4.orig/examples/websocket.html ++++ python-eventlet-0.17.4/examples/websocket.html +@@ -3,8 +3,8 @@ + + +- +- ++ ++ + ++ + +{% endblock %} diff --git a/eventlet/doc/authors.rst b/python-eventlet/doc/authors.rst similarity index 100% rename from eventlet/doc/authors.rst rename to python-eventlet/doc/authors.rst diff --git a/eventlet/doc/basic_usage.rst b/python-eventlet/doc/basic_usage.rst similarity index 100% rename from eventlet/doc/basic_usage.rst rename to python-eventlet/doc/basic_usage.rst diff --git a/eventlet/doc/common.txt b/python-eventlet/doc/common.txt similarity index 100% rename from eventlet/doc/common.txt rename to python-eventlet/doc/common.txt diff --git a/eventlet/doc/conf.py b/python-eventlet/doc/conf.py similarity index 100% rename from eventlet/doc/conf.py rename to python-eventlet/doc/conf.py diff --git a/eventlet/doc/design_patterns.rst b/python-eventlet/doc/design_patterns.rst similarity index 100% rename from eventlet/doc/design_patterns.rst rename to python-eventlet/doc/design_patterns.rst diff --git a/eventlet/doc/environment.rst b/python-eventlet/doc/environment.rst similarity index 100% rename from eventlet/doc/environment.rst rename to python-eventlet/doc/environment.rst diff --git a/eventlet/doc/examples.rst b/python-eventlet/doc/examples.rst similarity index 100% rename from eventlet/doc/examples.rst rename to python-eventlet/doc/examples.rst diff --git a/eventlet/doc/history.rst b/python-eventlet/doc/history.rst similarity index 100% rename from eventlet/doc/history.rst rename to python-eventlet/doc/history.rst diff --git a/eventlet/doc/hubs.rst b/python-eventlet/doc/hubs.rst similarity index 100% rename from eventlet/doc/hubs.rst rename to python-eventlet/doc/hubs.rst diff --git a/eventlet/doc/images/threading_illustration.png b/python-eventlet/doc/images/threading_illustration.png similarity index 100% rename from eventlet/doc/images/threading_illustration.png rename to python-eventlet/doc/images/threading_illustration.png diff --git a/eventlet/doc/index.rst b/python-eventlet/doc/index.rst similarity index 100% rename from eventlet/doc/index.rst rename to python-eventlet/doc/index.rst diff --git a/python-eventlet/doc/make.bat b/python-eventlet/doc/make.bat new file mode 100644 index 0000000..cfc1e8e --- /dev/null +++ b/python-eventlet/doc/make.bat @@ -0,0 +1,112 @@ +@ECHO OFF + +REM Command file for Sphinx documentation + +set SPHINXBUILD=sphinx-build +set ALLSPHINXOPTS=-d _build/doctrees %SPHINXOPTS% . +if NOT "%PAPER%" == "" ( + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% +) + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end +) + +if "%1" == "clean" ( + for /d %%i in (_build\*) do rmdir /q /s %%i + del /q /s _build\* + goto end +) + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% _build/html + echo. + echo.Build finished. The HTML pages are in _build/html. + goto end +) + +if "%1" == "dirhtml" ( + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% _build/dirhtml + echo. + echo.Build finished. The HTML pages are in _build/dirhtml. + goto end +) + +if "%1" == "pickle" ( + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% _build/pickle + echo. + echo.Build finished; now you can process the pickle files. + goto end +) + +if "%1" == "json" ( + %SPHINXBUILD% -b json %ALLSPHINXOPTS% _build/json + echo. + echo.Build finished; now you can process the JSON files. + goto end +) + +if "%1" == "htmlhelp" ( + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% _build/htmlhelp + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ +.hhp project file in _build/htmlhelp. + goto end +) + +if "%1" == "qthelp" ( + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% _build/qthelp + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ +.qhcp project file in _build/qthelp, like this: + echo.^> qcollectiongenerator _build\qthelp\Eventlet.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile _build\qthelp\Eventlet.ghc + goto end +) + +if "%1" == "latex" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% _build/latex + echo. + echo.Build finished; the LaTeX files are in _build/latex. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% _build/changes + echo. + echo.The overview file is in _build/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% _build/linkcheck + echo. + echo.Link check complete; look for any errors in the above output ^ +or in _build/linkcheck/output.txt. + goto end +) + +if "%1" == "doctest" ( + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% _build/doctest + echo. + echo.Testing of doctests in the sources finished, look at the ^ +results in _build/doctest/output.txt. + goto end +) + +:end diff --git a/eventlet/doc/modules.rst b/python-eventlet/doc/modules.rst similarity index 100% rename from eventlet/doc/modules.rst rename to python-eventlet/doc/modules.rst diff --git a/eventlet/doc/modules/backdoor.rst b/python-eventlet/doc/modules/backdoor.rst similarity index 100% rename from eventlet/doc/modules/backdoor.rst rename to python-eventlet/doc/modules/backdoor.rst diff --git a/eventlet/doc/modules/corolocal.rst b/python-eventlet/doc/modules/corolocal.rst similarity index 100% rename from eventlet/doc/modules/corolocal.rst rename to python-eventlet/doc/modules/corolocal.rst diff --git a/eventlet/doc/modules/db_pool.rst b/python-eventlet/doc/modules/db_pool.rst similarity index 100% rename from eventlet/doc/modules/db_pool.rst rename to python-eventlet/doc/modules/db_pool.rst diff --git a/eventlet/doc/modules/debug.rst b/python-eventlet/doc/modules/debug.rst similarity index 100% rename from eventlet/doc/modules/debug.rst rename to python-eventlet/doc/modules/debug.rst diff --git a/eventlet/doc/modules/event.rst b/python-eventlet/doc/modules/event.rst similarity index 100% rename from eventlet/doc/modules/event.rst rename to python-eventlet/doc/modules/event.rst diff --git a/eventlet/doc/modules/greenpool.rst b/python-eventlet/doc/modules/greenpool.rst similarity index 100% rename from eventlet/doc/modules/greenpool.rst rename to python-eventlet/doc/modules/greenpool.rst diff --git a/eventlet/doc/modules/greenthread.rst b/python-eventlet/doc/modules/greenthread.rst similarity index 100% rename from eventlet/doc/modules/greenthread.rst rename to python-eventlet/doc/modules/greenthread.rst diff --git a/eventlet/doc/modules/pools.rst b/python-eventlet/doc/modules/pools.rst similarity index 100% rename from eventlet/doc/modules/pools.rst rename to python-eventlet/doc/modules/pools.rst diff --git a/eventlet/doc/modules/queue.rst b/python-eventlet/doc/modules/queue.rst similarity index 100% rename from eventlet/doc/modules/queue.rst rename to python-eventlet/doc/modules/queue.rst diff --git a/eventlet/doc/modules/semaphore.rst b/python-eventlet/doc/modules/semaphore.rst similarity index 100% rename from eventlet/doc/modules/semaphore.rst rename to python-eventlet/doc/modules/semaphore.rst diff --git a/eventlet/doc/modules/timeout.rst b/python-eventlet/doc/modules/timeout.rst similarity index 100% rename from eventlet/doc/modules/timeout.rst rename to python-eventlet/doc/modules/timeout.rst diff --git a/eventlet/doc/modules/websocket.rst b/python-eventlet/doc/modules/websocket.rst similarity index 100% rename from eventlet/doc/modules/websocket.rst rename to python-eventlet/doc/modules/websocket.rst diff --git a/eventlet/doc/modules/wsgi.rst b/python-eventlet/doc/modules/wsgi.rst similarity index 100% rename from eventlet/doc/modules/wsgi.rst rename to python-eventlet/doc/modules/wsgi.rst diff --git a/eventlet/doc/modules/zmq.rst b/python-eventlet/doc/modules/zmq.rst similarity index 100% rename from eventlet/doc/modules/zmq.rst rename to python-eventlet/doc/modules/zmq.rst diff --git a/eventlet/doc/patching.rst b/python-eventlet/doc/patching.rst similarity index 100% rename from eventlet/doc/patching.rst rename to python-eventlet/doc/patching.rst diff --git a/python-eventlet/doc/real_index.html b/python-eventlet/doc/real_index.html new file mode 100644 index 0000000..d9a7d60 --- /dev/null +++ b/python-eventlet/doc/real_index.html @@ -0,0 +1,181 @@ + + + + + + + Eventlet Networking Library + + + + + + + + +
+
+
+
+ +
+

Eventlet

+ +

Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it.

+ +
    +
  • It uses epoll or kqueue or libevent for highly scalable non-blocking I/O.
    • +
  • Coroutines ensure that the developer uses a blocking style of programming that is similar to threading, but provide the benefits of non-blocking I/O.
    • +
  • The event dispatch is implicit, which means you can easily use Eventlet from the Python interpreter, or as a small part of a larger application.
    • +
+ +

It's easy to get started using Eventlet, and easy to convert existing applications to use it. Start off by looking at examples, common design patterns, and the list of the basic API primitives.

+ +

License: MIT.

+ +

API Documentation

+ + +

Installation

+ +

To install eventlet, simply: +

+pip install eventlet
+

+ +

Alternately, you can download the source tarball:

+ + + +

Discussion

+ + + + +

Development

+ + +

Both repositories are equal and kept in sync. + You can use whichever you fancy for downloading, forking, reporting issues and submitting pull requests.

+

Mercurial repository used to be the main one, but most of the contribution and discussions happen on Github nowadays.

+ +

Pull request policy

+
    +
  • Test is required
    • +
  • One commit is strongly preferred, except for very big changes
    • +
  • Commit message should follow the following formula: +
    +subsystem: description of why the change is useful
+
+optional details or links to related issues or websites
+
    + The why part is very important. Diff already says what you have done. But nobody knows why. +
    • +
  • Feel free to append yourself into AUTHORS file, sections Thanks To or Contributors. +
+

If you don't like these rules, raw patches are more than welcome!

+ + +

Bugs

+ +

Please be sure to report bugs as effectively as possible, to ensure that we understand and act on them quickly.

+ +

You may report bugs via: +

    +
  1. Github
    2. +
  2. Bitbucket (no registration is required)
    3. +
  3. Email eventletdev@lists.secondlife.com
    4. +
+ + +
+

Web Crawler Example¶

+

This is a simple web “crawler” that fetches a bunch of urls using a coroutine pool. It has as much concurrency (i.e. pages being fetched simultaneously) as coroutines in the pool.

+ +
import eventlet
+from eventlet.green import urllib2
+
+
+urls = [
+    "http://www.google.com/intl/en_ALL/images/logo.gif",
+    "https://wiki.secondlife.com/w/images/secondlife.jpg",
+    "http://us.i1.yimg.com/us.yimg.com/i/ww/beta/y3.gif",
+]
+
+
+def fetch(url):
+    return urllib2.urlopen(url).read()
+
+
+pool = eventlet.GreenPool()
+
+for body in pool.imap(fetch, urls):
+    print("got body", len(body))
+
+ + +

Stats

+

Travis build

+ + + +
+
+
+ + +
+
+
+
+
+
+
+

Links

+ +
+
+ + + + + diff --git a/eventlet/doc/ssl.rst b/python-eventlet/doc/ssl.rst similarity index 100% rename from eventlet/doc/ssl.rst rename to python-eventlet/doc/ssl.rst diff --git a/eventlet/doc/testing.rst b/python-eventlet/doc/testing.rst similarity index 100% rename from eventlet/doc/testing.rst rename to python-eventlet/doc/testing.rst diff --git a/eventlet/doc/threading.rst b/python-eventlet/doc/threading.rst similarity index 100% rename from eventlet/doc/threading.rst rename to python-eventlet/doc/threading.rst diff --git a/eventlet/doc/zeromq.rst b/python-eventlet/doc/zeromq.rst similarity index 100% rename from eventlet/doc/zeromq.rst rename to python-eventlet/doc/zeromq.rst diff --git a/eventlet/eventlet/__init__.py b/python-eventlet/eventlet/__init__.py similarity index 98% rename from eventlet/eventlet/__init__.py rename to python-eventlet/eventlet/__init__.py index 7b7b3bf..1bdcf52 100644 --- a/eventlet/eventlet/__init__.py +++ b/python-eventlet/eventlet/__init__.py @@ -1,4 +1,4 @@ -version_info = (0, 16, 1) +version_info = (0, 17, 4) __version__ = '.'.join(map(str, version_info)) try: diff --git a/eventlet/eventlet/backdoor.py b/python-eventlet/eventlet/backdoor.py similarity index 100% rename from eventlet/eventlet/backdoor.py rename to python-eventlet/eventlet/backdoor.py diff --git a/eventlet/eventlet/convenience.py b/python-eventlet/eventlet/convenience.py similarity index 100% rename from eventlet/eventlet/convenience.py rename to python-eventlet/eventlet/convenience.py diff --git a/eventlet/eventlet/corolocal.py b/python-eventlet/eventlet/corolocal.py similarity index 100% rename from eventlet/eventlet/corolocal.py rename to python-eventlet/eventlet/corolocal.py diff --git a/eventlet/eventlet/coros.py b/python-eventlet/eventlet/coros.py similarity index 100% rename from eventlet/eventlet/coros.py rename to python-eventlet/eventlet/coros.py diff --git a/eventlet/eventlet/db_pool.py b/python-eventlet/eventlet/db_pool.py similarity index 100% rename from eventlet/eventlet/db_pool.py rename to python-eventlet/eventlet/db_pool.py diff --git a/eventlet/eventlet/debug.py b/python-eventlet/eventlet/debug.py similarity index 100% rename from eventlet/eventlet/debug.py rename to python-eventlet/eventlet/debug.py diff --git a/eventlet/eventlet/event.py b/python-eventlet/eventlet/event.py similarity index 99% rename from eventlet/eventlet/event.py rename to python-eventlet/eventlet/event.py index f06e006..22d0aa1 100644 --- a/eventlet/eventlet/event.py +++ b/python-eventlet/eventlet/event.py @@ -109,7 +109,7 @@ class Event(object): waited for result Returns immediately if the event has already - occured. + occurred. >>> evt.wait() 'result' diff --git a/eventlet/eventlet/green/BaseHTTPServer.py b/python-eventlet/eventlet/green/BaseHTTPServer.py similarity index 100% rename from eventlet/eventlet/green/BaseHTTPServer.py rename to python-eventlet/eventlet/green/BaseHTTPServer.py diff --git a/eventlet/eventlet/green/CGIHTTPServer.py b/python-eventlet/eventlet/green/CGIHTTPServer.py similarity index 100% rename from eventlet/eventlet/green/CGIHTTPServer.py rename to python-eventlet/eventlet/green/CGIHTTPServer.py diff --git a/eventlet/eventlet/green/MySQLdb.py b/python-eventlet/eventlet/green/MySQLdb.py similarity index 100% rename from eventlet/eventlet/green/MySQLdb.py rename to python-eventlet/eventlet/green/MySQLdb.py diff --git a/eventlet/eventlet/green/OpenSSL/SSL.py b/python-eventlet/eventlet/green/OpenSSL/SSL.py similarity index 100% rename from eventlet/eventlet/green/OpenSSL/SSL.py rename to python-eventlet/eventlet/green/OpenSSL/SSL.py diff --git a/eventlet/eventlet/green/OpenSSL/__init__.py b/python-eventlet/eventlet/green/OpenSSL/__init__.py similarity index 100% rename from eventlet/eventlet/green/OpenSSL/__init__.py rename to python-eventlet/eventlet/green/OpenSSL/__init__.py diff --git a/eventlet/eventlet/green/OpenSSL/crypto.py b/python-eventlet/eventlet/green/OpenSSL/crypto.py similarity index 100% rename from eventlet/eventlet/green/OpenSSL/crypto.py rename to python-eventlet/eventlet/green/OpenSSL/crypto.py diff --git a/eventlet/eventlet/green/OpenSSL/rand.py b/python-eventlet/eventlet/green/OpenSSL/rand.py similarity index 100% rename from eventlet/eventlet/green/OpenSSL/rand.py rename to python-eventlet/eventlet/green/OpenSSL/rand.py diff --git a/eventlet/eventlet/green/OpenSSL/tsafe.py b/python-eventlet/eventlet/green/OpenSSL/tsafe.py similarity index 100% rename from eventlet/eventlet/green/OpenSSL/tsafe.py rename to python-eventlet/eventlet/green/OpenSSL/tsafe.py diff --git a/eventlet/eventlet/green/OpenSSL/version.py b/python-eventlet/eventlet/green/OpenSSL/version.py similarity index 100% rename from eventlet/eventlet/green/OpenSSL/version.py rename to python-eventlet/eventlet/green/OpenSSL/version.py diff --git a/eventlet/eventlet/green/Queue.py b/python-eventlet/eventlet/green/Queue.py similarity index 100% rename from eventlet/eventlet/green/Queue.py rename to python-eventlet/eventlet/green/Queue.py diff --git a/eventlet/eventlet/green/SimpleHTTPServer.py b/python-eventlet/eventlet/green/SimpleHTTPServer.py similarity index 100% rename from eventlet/eventlet/green/SimpleHTTPServer.py rename to python-eventlet/eventlet/green/SimpleHTTPServer.py diff --git a/eventlet/eventlet/green/SocketServer.py b/python-eventlet/eventlet/green/SocketServer.py similarity index 100% rename from eventlet/eventlet/green/SocketServer.py rename to python-eventlet/eventlet/green/SocketServer.py diff --git a/eventlet/eventlet/green/__init__.py b/python-eventlet/eventlet/green/__init__.py similarity index 100% rename from eventlet/eventlet/green/__init__.py rename to python-eventlet/eventlet/green/__init__.py diff --git a/python-eventlet/eventlet/green/_socket_nodns.py b/python-eventlet/eventlet/green/_socket_nodns.py new file mode 100644 index 0000000..8bfecfd --- /dev/null +++ b/python-eventlet/eventlet/green/_socket_nodns.py @@ -0,0 +1,31 @@ +__socket = __import__('socket') + +__all__ = __socket.__all__ +__patched__ = ['fromfd', 'socketpair', 'ssl', 'socket'] + +from eventlet.patcher import slurp_properties +slurp_properties(__socket, globals(), + ignore=__patched__, srckeys=dir(__socket)) + +os = __import__('os') +import sys +from eventlet.hubs import get_hub +from eventlet.greenio import GreenSocket as socket +from eventlet.greenio import _GLOBAL_DEFAULT_TIMEOUT + +try: + __original_fromfd__ = __socket.fromfd + + def fromfd(*args): + return socket(__original_fromfd__(*args)) +except AttributeError: + pass + +try: + __original_socketpair__ = __socket.socketpair + + def socketpair(*args): + one, two = __original_socketpair__(*args) + return socket(one), socket(two) +except AttributeError: + pass diff --git a/eventlet/eventlet/green/asynchat.py b/python-eventlet/eventlet/green/asynchat.py similarity index 100% rename from eventlet/eventlet/green/asynchat.py rename to python-eventlet/eventlet/green/asynchat.py diff --git a/eventlet/eventlet/green/asyncore.py b/python-eventlet/eventlet/green/asyncore.py similarity index 100% rename from eventlet/eventlet/green/asyncore.py rename to python-eventlet/eventlet/green/asyncore.py diff --git a/eventlet/eventlet/green/builtin.py b/python-eventlet/eventlet/green/builtin.py similarity index 100% rename from eventlet/eventlet/green/builtin.py rename to python-eventlet/eventlet/green/builtin.py diff --git a/eventlet/eventlet/green/ftplib.py b/python-eventlet/eventlet/green/ftplib.py similarity index 100% rename from eventlet/eventlet/green/ftplib.py rename to python-eventlet/eventlet/green/ftplib.py diff --git a/python-eventlet/eventlet/green/http/__init__.py b/python-eventlet/eventlet/green/http/__init__.py new file mode 100644 index 0000000..c9e2a23 --- /dev/null +++ b/python-eventlet/eventlet/green/http/__init__.py @@ -0,0 +1,2 @@ +from eventlet.support import six +assert six.PY3, 'This is a Python 3 module' diff --git a/python-eventlet/eventlet/green/http/client.py b/python-eventlet/eventlet/green/http/client.py new file mode 100644 index 0000000..480a252 --- /dev/null +++ b/python-eventlet/eventlet/green/http/client.py @@ -0,0 +1,9 @@ +from eventlet import patcher +from eventlet.green import os, socket +from eventlet.green.urllib import parse as urllib_parse + +patcher.inject('http.client', globals(), + ('os', os), ('socket', socket), ('urllib.parse', urllib_parse)) + +del patcher +del urllib_parse diff --git a/python-eventlet/eventlet/green/http/cookiejar.py b/python-eventlet/eventlet/green/http/cookiejar.py new file mode 100644 index 0000000..5e511d2 --- /dev/null +++ b/python-eventlet/eventlet/green/http/cookiejar.py @@ -0,0 +1,13 @@ +from eventlet.green import threading, time +from eventlet.green.http import client +from eventlet.green.urllib import parse as urllib_parse, request as urllib_request +from eventlet import patcher + +patcher.inject('http.cookiejar', globals(), + ('http.client', client), ('threading', threading), + ('urllib.parse', urllib_parse), ('urllib.request', urllib_request), + ('time', time)) + +del urllib_request +del urllib_parse +del patcher diff --git a/python-eventlet/eventlet/green/http/cookies.py b/python-eventlet/eventlet/green/http/cookies.py new file mode 100644 index 0000000..e139069 --- /dev/null +++ b/python-eventlet/eventlet/green/http/cookies.py @@ -0,0 +1,7 @@ +from eventlet import patcher +from eventlet.green import time + +patcher.inject('http.cookies', globals()) +_getdate = patcher.patch_function(_getdate, ('time', time)) + +del patcher diff --git a/python-eventlet/eventlet/green/http/server.py b/python-eventlet/eventlet/green/http/server.py new file mode 100644 index 0000000..35c3ab2 --- /dev/null +++ b/python-eventlet/eventlet/green/http/server.py @@ -0,0 +1,17 @@ +from eventlet import patcher +from eventlet.green import os, time, select, socket, SocketServer, subprocess +from eventlet.green.http import client +from eventlet.green.urllib import parse as urllib_parse + +patcher.inject('http.server', globals(), + ('http.client', client), ('os', os), ('select', select), + ('socket', socket), ('socketserver', SocketServer), ('time', time), + ('urllib.parse', urllib_parse)) + + +CGIHTTPRequestHandler.run_cgi = patcher.patch_function( + CGIHTTPRequestHandler.run_cgi, ('subprocess', subprocess)) + +del urllib_parse +del client +del patcher diff --git a/eventlet/eventlet/green/httplib.py b/python-eventlet/eventlet/green/httplib.py similarity index 100% rename from eventlet/eventlet/green/httplib.py rename to python-eventlet/eventlet/green/httplib.py diff --git a/eventlet/eventlet/green/os.py b/python-eventlet/eventlet/green/os.py similarity index 100% rename from eventlet/eventlet/green/os.py rename to python-eventlet/eventlet/green/os.py diff --git a/eventlet/eventlet/green/profile.py b/python-eventlet/eventlet/green/profile.py similarity index 100% rename from eventlet/eventlet/green/profile.py rename to python-eventlet/eventlet/green/profile.py diff --git a/eventlet/eventlet/green/select.py b/python-eventlet/eventlet/green/select.py similarity index 100% rename from eventlet/eventlet/green/select.py rename to python-eventlet/eventlet/green/select.py diff --git a/python-eventlet/eventlet/green/selectors.py b/python-eventlet/eventlet/green/selectors.py new file mode 100644 index 0000000..26427ec --- /dev/null +++ b/python-eventlet/eventlet/green/selectors.py @@ -0,0 +1,11 @@ +import sys + +from eventlet import patcher +from eventlet.green import select + +patcher.inject('selectors', globals(), ('select', select)) + +del patcher + +if sys.platform != 'win32': + SelectSelector._select = staticmethod(select.select) diff --git a/eventlet/eventlet/green/socket.py b/python-eventlet/eventlet/green/socket.py similarity index 92% rename from eventlet/eventlet/green/socket.py rename to python-eventlet/eventlet/green/socket.py index 2ec9d1b..e8ef032 100644 --- a/eventlet/eventlet/green/socket.py +++ b/python-eventlet/eventlet/green/socket.py @@ -1,6 +1,6 @@ import os import sys -from eventlet.hubs import get_hub + __import__('eventlet.green._socket_nodns') __socket = sys.modules['eventlet.green._socket_nodns'] @@ -39,7 +39,7 @@ def create_connection(address, is used. """ - msg = "getaddrinfo returns an empty list" + err = "getaddrinfo returns an empty list" host, port = address for res in getaddrinfo(host, port, 0, SOCK_STREAM): af, socktype, proto, canonname, sa = res @@ -54,8 +54,10 @@ def create_connection(address, return sock except error as e: - msg = e + err = e if sock is not None: sock.close() - raise error(msg) + if not isinstance(err, error): + err = error(err) + raise err diff --git a/eventlet/eventlet/green/ssl.py b/python-eventlet/eventlet/green/ssl.py similarity index 95% rename from eventlet/eventlet/green/ssl.py rename to python-eventlet/eventlet/green/ssl.py index 963fbdb..ded6533 100644 --- a/eventlet/eventlet/green/ssl.py +++ b/python-eventlet/eventlet/green/ssl.py @@ -3,6 +3,7 @@ __ssl = __import__('ssl') from eventlet.patcher import slurp_properties slurp_properties(__ssl, globals(), srckeys=dir(__ssl)) +import functools import sys import errno time = __import__('time') @@ -162,11 +163,14 @@ class GreenSSLSocket(_original_sslsocket): self.__class__) amount = len(data) count = 0 + data_to_send = data while (count < amount): - v = self.send(data[count:]) + v = self.send(data_to_send) count += v if v == 0: trampoline(self, write=True, timeout_exc=timeout_exc('timed out')) + else: + data_to_send = data[count:] return amount else: while True: @@ -342,7 +346,7 @@ def wrap_socket(sock, *a, **kw): if hasattr(__ssl, 'sslwrap_simple'): def sslwrap_simple(sock, keyfile=None, certfile=None): """A replacement for the old socket.ssl function. Designed - for compability with Python 2.5 and earlier. Will disappear in + for compatibility with Python 2.5 and earlier. Will disappear in Python 3.0.""" ssl_sock = GreenSSLSocket(sock, keyfile=keyfile, certfile=certfile, server_side=False, @@ -350,3 +354,14 @@ if hasattr(__ssl, 'sslwrap_simple'): ssl_version=PROTOCOL_SSLv23, ca_certs=None) return ssl_sock + + +if hasattr(__ssl, 'SSLContext'): + @functools.wraps(__ssl.SSLContext.wrap_socket) + def _green_sslcontext_wrap_socket(self, sock, *a, **kw): + return GreenSSLSocket(sock, *a, _context=self, **kw) + + # FIXME: + # * GreenSSLContext akin to GreenSSLSocket + # * make ssl.create_default_context() use modified SSLContext from globals as usual + __ssl.SSLContext.wrap_socket = _green_sslcontext_wrap_socket diff --git a/eventlet/eventlet/green/subprocess.py b/python-eventlet/eventlet/green/subprocess.py similarity index 93% rename from eventlet/eventlet/green/subprocess.py rename to python-eventlet/eventlet/green/subprocess.py index 1d7c49a..7ce38cf 100644 --- a/eventlet/eventlet/green/subprocess.py +++ b/python-eventlet/eventlet/green/subprocess.py @@ -1,15 +1,21 @@ import errno -import time +import sys from types import FunctionType import eventlet from eventlet import greenio from eventlet import patcher -from eventlet.green import select +from eventlet.green import select, threading, time from eventlet.support import six -patcher.inject('subprocess', globals(), ('select', select)) +to_patch = [('select', select), ('threading', threading), ('time', time)] + +if sys.version_info > (3, 4): + from eventlet.green import selectors + to_patch.append(('selectors', selectors)) + +patcher.inject('subprocess', globals(), *to_patch) subprocess_orig = __import__("subprocess") diff --git a/eventlet/eventlet/green/thread.py b/python-eventlet/eventlet/green/thread.py similarity index 68% rename from eventlet/eventlet/green/thread.py rename to python-eventlet/eventlet/green/thread.py index 2360310..5c7446f 100644 --- a/eventlet/eventlet/green/thread.py +++ b/python-eventlet/eventlet/green/thread.py @@ -3,6 +3,7 @@ from eventlet.support.six.moves import _thread as __thread from eventlet.support import greenlets as greenlet, six from eventlet import greenthread from eventlet.semaphore import Semaphore as LockType +import sys __patched__ = ['get_ident', 'start_new_thread', 'start_new', 'allocate_lock', @@ -43,6 +44,29 @@ def __thread_body(func, args, kwargs): def start_new_thread(function, args=(), kwargs=None): + if (sys.version_info >= (3, 4) + and getattr(function, '__module__', '') == 'threading' + and hasattr(function, '__self__')): + # Since Python 3.4, threading.Thread uses an internal lock + # automatically released when the python thread state is deleted. + # With monkey patching, eventlet uses green threads without python + # thread state, so the lock is not automatically released. + # + # Wrap _bootstrap_inner() to release explicitly the thread state lock + # when the thread completes. + thread = function.__self__ + bootstrap_inner = thread._bootstrap_inner + + def wrap_bootstrap_inner(): + try: + bootstrap_inner() + finally: + # The lock can be cleared (ex: by a fork()) + if thread._tstate_lock is not None: + thread._tstate_lock.release() + + thread._bootstrap_inner = wrap_bootstrap_inner + kwargs = kwargs or {} g = greenthread.spawn_n(__thread_body, function, args, kwargs) return get_ident(g) diff --git a/eventlet/eventlet/green/threading.py b/python-eventlet/eventlet/green/threading.py similarity index 100% rename from eventlet/eventlet/green/threading.py rename to python-eventlet/eventlet/green/threading.py diff --git a/eventlet/eventlet/green/time.py b/python-eventlet/eventlet/green/time.py similarity index 100% rename from eventlet/eventlet/green/time.py rename to python-eventlet/eventlet/green/time.py diff --git a/python-eventlet/eventlet/green/urllib/__init__.py b/python-eventlet/eventlet/green/urllib/__init__.py new file mode 100644 index 0000000..7cb4ea6 --- /dev/null +++ b/python-eventlet/eventlet/green/urllib/__init__.py @@ -0,0 +1,40 @@ +from eventlet import patcher +from eventlet.green import socket +from eventlet.green import time +from eventlet.green import httplib +from eventlet.green import ftplib +from eventlet.support import six + +if six.PY2: + to_patch = [('socket', socket), ('httplib', httplib), + ('time', time), ('ftplib', ftplib)] + try: + from eventlet.green import ssl + to_patch.append(('ssl', ssl)) + except ImportError: + pass + + patcher.inject('urllib', globals(), *to_patch) + try: + URLopener + except NameError: + patcher.inject('urllib.request', globals(), *to_patch) + + + # patch a bunch of things that have imports inside the + # function body; this is lame and hacky but I don't feel + # too bad because urllib is a hacky pile of junk that no + # one should be using anyhow + URLopener.open_http = patcher.patch_function(URLopener.open_http, ('httplib', httplib)) + if hasattr(URLopener, 'open_https'): + URLopener.open_https = patcher.patch_function(URLopener.open_https, ('httplib', httplib)) + + URLopener.open_ftp = patcher.patch_function(URLopener.open_ftp, ('ftplib', ftplib)) + ftpwrapper.init = patcher.patch_function(ftpwrapper.init, ('ftplib', ftplib)) + ftpwrapper.retrfile = patcher.patch_function(ftpwrapper.retrfile, ('ftplib', ftplib)) + + del patcher + + # Run test program when run as a script + if __name__ == '__main__': + main() diff --git a/python-eventlet/eventlet/green/urllib/error.py b/python-eventlet/eventlet/green/urllib/error.py new file mode 100644 index 0000000..6913813 --- /dev/null +++ b/python-eventlet/eventlet/green/urllib/error.py @@ -0,0 +1,4 @@ +from eventlet import patcher +from eventlet.green.urllib import response +patcher.inject('urllib.error', globals(), ('urllib.response', response)) +del patcher diff --git a/python-eventlet/eventlet/green/urllib/parse.py b/python-eventlet/eventlet/green/urllib/parse.py new file mode 100644 index 0000000..f3a8924 --- /dev/null +++ b/python-eventlet/eventlet/green/urllib/parse.py @@ -0,0 +1,3 @@ +from eventlet import patcher +patcher.inject('urllib.parse', globals()) +del patcher diff --git a/python-eventlet/eventlet/green/urllib/request.py b/python-eventlet/eventlet/green/urllib/request.py new file mode 100644 index 0000000..8160bb9 --- /dev/null +++ b/python-eventlet/eventlet/green/urllib/request.py @@ -0,0 +1,44 @@ +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 diff --git a/python-eventlet/eventlet/green/urllib/response.py b/python-eventlet/eventlet/green/urllib/response.py new file mode 100644 index 0000000..f9aaba5 --- /dev/null +++ b/python-eventlet/eventlet/green/urllib/response.py @@ -0,0 +1,3 @@ +from eventlet import patcher +patcher.inject('urllib.response', globals()) +del patcher diff --git a/eventlet/eventlet/green/urllib2.py b/python-eventlet/eventlet/green/urllib2.py similarity index 100% rename from eventlet/eventlet/green/urllib2.py rename to python-eventlet/eventlet/green/urllib2.py diff --git a/eventlet/eventlet/green/zmq.py b/python-eventlet/eventlet/green/zmq.py similarity index 99% rename from eventlet/eventlet/green/zmq.py rename to python-eventlet/eventlet/green/zmq.py index b08eabd..c1097fa 100644 --- a/eventlet/eventlet/green/zmq.py +++ b/python-eventlet/eventlet/green/zmq.py @@ -204,7 +204,7 @@ class Socket(_Socket): * send * recv * getsockopt - To ensure that the ``zmq.NOBLOCK`` flag is set and that sending or recieving + To ensure that the ``zmq.NOBLOCK`` flag is set and that sending or receiving is deferred to the hub (using :func:`eventlet.hubs.trampoline`) if a ``zmq.EAGAIN`` (retry) error is raised diff --git a/python-eventlet/eventlet/greenio/__init__.py b/python-eventlet/eventlet/greenio/__init__.py new file mode 100644 index 0000000..72cd33e --- /dev/null +++ b/python-eventlet/eventlet/greenio/__init__.py @@ -0,0 +1,8 @@ +from eventlet.support import six + +from eventlet.greenio.base import * # noqa + +if six.PY2: + from eventlet.greenio.py2 import * # noqa +else: + from eventlet.greenio.py3 import * # noqa diff --git a/eventlet/eventlet/greenio.py b/python-eventlet/eventlet/greenio/base.py similarity index 71% rename from eventlet/eventlet/greenio.py rename to python-eventlet/eventlet/greenio/base.py index f44096e..8da51ca 100644 --- a/eventlet/eventlet/greenio.py +++ b/python-eventlet/eventlet/greenio/base.py @@ -7,9 +7,13 @@ import time import warnings from eventlet.support import get_errno, six -from eventlet.hubs import trampoline, notify_close, notify_opened, IOClosed +from eventlet.hubs import trampoline, notify_opened, IOClosed -__all__ = ['GreenSocket', 'GreenPipe', 'shutdown_safe'] +__all__ = [ + 'GreenSocket', '_GLOBAL_DEFAULT_TIMEOUT', 'set_nonblocking', + 'SOCKET_CLOSED', 'CONNECT_ERR', 'CONNECT_SUCCESS', + 'shutdown_safe', 'SSL', +] BUFFER_SIZE = 4096 CONNECT_ERR = set((errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK)) @@ -17,11 +21,8 @@ CONNECT_SUCCESS = set((0, errno.EISCONN)) if sys.platform[:3] == "win": CONNECT_ERR.add(errno.WSAEINVAL) # Bug 67 -if six.PY3: - from io import IOBase as file - _fileobject = socket.SocketIO -elif six.PY2: - _fileobject = socket._fileobject +if six.PY2: + _python2_fileobject = socket._fileobject def socket_connect(descriptor, address): @@ -293,7 +294,7 @@ class GreenSocket(object): else: def makefile(self, *args, **kwargs): dupped = self.dup() - res = _fileobject(dupped, *args, **kwargs) + res = _python2_fileobject(dupped, *args, **kwargs) if hasattr(dupped, "_drop"): dupped._drop() return res @@ -418,119 +419,11 @@ class GreenSocket(object): getattr(self.fd, '_sock', self.fd)._drop() -class _SocketDuckForFd(object): - """Class implementing all socket method used by _fileobject - in cooperative manner using low level os I/O calls. - """ - _refcount = 0 - - def __init__(self, fileno): - self._fileno = fileno - notify_opened(fileno) - self._closed = False - - def _trampoline(self, fd, read=False, write=False, timeout=None, timeout_exc=None): - if self._closed: - # Don't trampoline if we're already closed. - raise IOClosed() - try: - return trampoline(fd, read=read, write=write, timeout=timeout, - timeout_exc=timeout_exc, - mark_as_closed=self._mark_as_closed) - except IOClosed: - # Our fileno has been obsoleted. Defang ourselves to - # prevent spurious closes. - self._mark_as_closed() - raise - - def _mark_as_closed(self): - self._closed = True - - @property - def _sock(self): - return self - - def fileno(self): - return self._fileno - - def recv(self, buflen): - while True: - try: - data = os.read(self._fileno, buflen) - return data - except OSError as e: - if get_errno(e) not in SOCKET_BLOCKING: - raise IOError(*e.args) - self._trampoline(self, read=True) - - def recv_into(self, buf, nbytes=0, flags=0): - if nbytes == 0: - nbytes = len(buf) - data = self.recv(nbytes) - buf[:nbytes] = data - return len(data) - - def send(self, data): - while True: - try: - return os.write(self._fileno, data) - except OSError as e: - if get_errno(e) not in SOCKET_BLOCKING: - raise IOError(*e.args) - else: - trampoline(self, write=True) - - def sendall(self, data): - len_data = len(data) - os_write = os.write - fileno = self._fileno - try: - total_sent = os_write(fileno, data) - except OSError as e: - if get_errno(e) != errno.EAGAIN: - raise IOError(*e.args) - total_sent = 0 - while total_sent < len_data: - self._trampoline(self, write=True) - try: - total_sent += os_write(fileno, data[total_sent:]) - except OSError as e: - if get_errno(e) != errno. EAGAIN: - raise IOError(*e.args) - - def __del__(self): - self._close() - - def _close(self): - notify_close(self._fileno) - self._mark_as_closed() - try: - os.close(self._fileno) - except: - # os.close may fail if __init__ didn't complete - # (i.e file dscriptor passed to popen was invalid - pass - - def __repr__(self): - return "%s:%d" % (self.__class__.__name__, self._fileno) - - def _reuse(self): - self._refcount += 1 - - def _drop(self): - self._refcount -= 1 - if self._refcount == 0: - self._close() - # Python3 - _decref_socketios = _drop - - -def _operationOnClosedFile(*args, **kwargs): +def _operation_on_closed_file(*args, **kwargs): raise ValueError("I/O operation on closed file") -class GreenPipe(_fileobject): - """ +greenpipe_doc = """ GreenPipe is a cooperative replacement for file class. It will cooperate on pipes. It will block on regular file. Differneces from file class: @@ -542,103 +435,6 @@ class GreenPipe(_fileobject): - file argument can be descriptor, file name or file object. """ - def __init__(self, f, mode='r', bufsize=-1): - if not isinstance(f, six.string_types + (int, file)): - raise TypeError('f(ile) should be int, str, unicode or file, not %r' % f) - - if isinstance(f, six.string_types): - f = open(f, mode, 0) - - if isinstance(f, int): - fileno = f - self._name = "" % fileno - else: - fileno = os.dup(f.fileno()) - self._name = f.name - if f.mode != mode: - raise ValueError('file.mode %r does not match mode parameter %r' % (f.mode, mode)) - self._name = f.name - f.close() - - super(GreenPipe, self).__init__(_SocketDuckForFd(fileno), mode) - set_nonblocking(self) - self.softspace = 0 - - @property - def name(self): - return self._name - - def __repr__(self): - return "<%s %s %r, mode %r at 0x%x>" % ( - self.closed and 'closed' or 'open', - self.__class__.__name__, - self.name, - self.mode, - (id(self) < 0) and (sys.maxint + id(self)) or id(self)) - - def close(self): - super(GreenPipe, self).close() - for method in [ - 'fileno', 'flush', 'isatty', 'next', 'read', 'readinto', - 'readline', 'readlines', 'seek', 'tell', 'truncate', - 'write', 'xreadlines', '__iter__', '__next__', 'writelines']: - setattr(self, method, _operationOnClosedFile) - - def __enter__(self): - return self - - def __exit__(self, *args): - self.close() - - def _get_readahead_len(self): - return len(self._rbuf.getvalue()) - - def _clear_readahead_buf(self): - len = self._get_readahead_len() - if len > 0: - self.read(len) - - def tell(self): - self.flush() - try: - return os.lseek(self.fileno(), 0, 1) - self._get_readahead_len() - except OSError as e: - raise IOError(*e.args) - - def seek(self, offset, whence=0): - self.flush() - if whence == 1 and offset == 0: # tell synonym - return self.tell() - if whence == 1: # adjust offset by what is read ahead - offset -= self._get_readahead_len() - try: - rv = os.lseek(self.fileno(), offset, whence) - except OSError as e: - raise IOError(*e.args) - else: - self._clear_readahead_buf() - return rv - - if getattr(file, "truncate", None): # not all OSes implement truncate - def truncate(self, size=-1): - self.flush() - if size == -1: - size = self.tell() - try: - rv = os.ftruncate(self.fileno(), size) - except OSError as e: - raise IOError(*e.args) - else: - self.seek(size) # move position&clear buffer - return rv - - def isatty(self): - try: - return os.isatty(self.fileno()) - except OSError as e: - raise IOError(*e.args) - - # import SSL module here so we can refer to greenio.SSL.exceptionclass try: from OpenSSL import SSL @@ -677,5 +473,5 @@ def shutdown_safe(sock): except socket.error as e: # we don't care if the socket is already closed; # this will often be the case in an http server context - if get_errno(e) != errno.ENOTCONN: + if get_errno(e) not in (errno.ENOTCONN, errno.EBADF): raise diff --git a/python-eventlet/eventlet/greenio/py2.py b/python-eventlet/eventlet/greenio/py2.py new file mode 100644 index 0000000..a0e9efe --- /dev/null +++ b/python-eventlet/eventlet/greenio/py2.py @@ -0,0 +1,226 @@ +import errno +import os + +from eventlet.greenio.base import ( + _operation_on_closed_file, + greenpipe_doc, + set_nonblocking, + socket, + SOCKET_BLOCKING, +) +from eventlet.hubs import trampoline, notify_close, notify_opened, IOClosed +from eventlet.support import get_errno, six + +__all__ = ['_fileobject', 'GreenPipe'] + +_fileobject = socket._fileobject + + +class GreenPipe(_fileobject): + + __doc__ = greenpipe_doc + + def __init__(self, f, mode='r', bufsize=-1): + if not isinstance(f, six.string_types + (int, file)): + raise TypeError('f(ile) should be int, str, unicode or file, not %r' % f) + + if isinstance(f, six.string_types): + f = open(f, mode, 0) + + if isinstance(f, int): + fileno = f + self._name = "" % fileno + else: + fileno = os.dup(f.fileno()) + self._name = f.name + if f.mode != mode: + raise ValueError('file.mode %r does not match mode parameter %r' % (f.mode, mode)) + self._name = f.name + f.close() + + super(GreenPipe, self).__init__(_SocketDuckForFd(fileno), mode) + set_nonblocking(self) + self.softspace = 0 + + @property + def name(self): + return self._name + + def __repr__(self): + return "<%s %s %r, mode %r at 0x%x>" % ( + self.closed and 'closed' or 'open', + self.__class__.__name__, + self.name, + self.mode, + (id(self) < 0) and (sys.maxint + id(self)) or id(self)) + + def close(self): + super(GreenPipe, self).close() + for method in [ + 'fileno', 'flush', 'isatty', 'next', 'read', 'readinto', + 'readline', 'readlines', 'seek', 'tell', 'truncate', + 'write', 'xreadlines', '__iter__', '__next__', 'writelines']: + setattr(self, method, _operation_on_closed_file) + + def __enter__(self): + return self + + def __exit__(self, *args): + self.close() + + def _get_readahead_len(self): + return len(self._rbuf.getvalue()) + + def _clear_readahead_buf(self): + len = self._get_readahead_len() + if len > 0: + self.read(len) + + def tell(self): + self.flush() + try: + return os.lseek(self.fileno(), 0, 1) - self._get_readahead_len() + except OSError as e: + raise IOError(*e.args) + + def seek(self, offset, whence=0): + self.flush() + if whence == 1 and offset == 0: # tell synonym + return self.tell() + if whence == 1: # adjust offset by what is read ahead + offset -= self._get_readahead_len() + try: + rv = os.lseek(self.fileno(), offset, whence) + except OSError as e: + raise IOError(*e.args) + else: + self._clear_readahead_buf() + return rv + + if getattr(file, "truncate", None): # not all OSes implement truncate + def truncate(self, size=-1): + self.flush() + if size == -1: + size = self.tell() + try: + rv = os.ftruncate(self.fileno(), size) + except OSError as e: + raise IOError(*e.args) + else: + self.seek(size) # move position&clear buffer + return rv + + def isatty(self): + try: + return os.isatty(self.fileno()) + except OSError as e: + raise IOError(*e.args) + + +class _SocketDuckForFd(object): + """Class implementing all socket method used by _fileobject + in cooperative manner using low level os I/O calls. + """ + _refcount = 0 + + def __init__(self, fileno): + self._fileno = fileno + notify_opened(fileno) + self._closed = False + + def _trampoline(self, fd, read=False, write=False, timeout=None, timeout_exc=None): + if self._closed: + # Don't trampoline if we're already closed. + raise IOClosed() + try: + return trampoline(fd, read=read, write=write, timeout=timeout, + timeout_exc=timeout_exc, + mark_as_closed=self._mark_as_closed) + except IOClosed: + # Our fileno has been obsoleted. Defang ourselves to + # prevent spurious closes. + self._mark_as_closed() + raise + + def _mark_as_closed(self): + current = self._closed + self._closed = True + return current + + @property + def _sock(self): + return self + + def fileno(self): + return self._fileno + + def recv(self, buflen): + while True: + try: + data = os.read(self._fileno, buflen) + return data + except OSError as e: + if get_errno(e) not in SOCKET_BLOCKING: + raise IOError(*e.args) + self._trampoline(self, read=True) + + def recv_into(self, buf, nbytes=0, flags=0): + if nbytes == 0: + nbytes = len(buf) + data = self.recv(nbytes) + buf[:nbytes] = data + return len(data) + + def send(self, data): + while True: + try: + return os.write(self._fileno, data) + except OSError as e: + if get_errno(e) not in SOCKET_BLOCKING: + raise IOError(*e.args) + else: + trampoline(self, write=True) + + def sendall(self, data): + len_data = len(data) + os_write = os.write + fileno = self._fileno + try: + total_sent = os_write(fileno, data) + except OSError as e: + if get_errno(e) != errno.EAGAIN: + raise IOError(*e.args) + total_sent = 0 + while total_sent < len_data: + self._trampoline(self, write=True) + try: + total_sent += os_write(fileno, data[total_sent:]) + except OSError as e: + if get_errno(e) != errno. EAGAIN: + raise IOError(*e.args) + + def __del__(self): + self._close() + + def _close(self): + was_closed = self._mark_as_closed() + if was_closed: + return + notify_close(self._fileno) + try: + os.close(self._fileno) + except: + # os.close may fail if __init__ didn't complete + # (i.e file dscriptor passed to popen was invalid + pass + + def __repr__(self): + return "%s:%d" % (self.__class__.__name__, self._fileno) + + def _reuse(self): + self._refcount += 1 + + def _drop(self): + self._refcount -= 1 + if self._refcount == 0: + self._close() diff --git a/python-eventlet/eventlet/greenio/py3.py b/python-eventlet/eventlet/greenio/py3.py new file mode 100644 index 0000000..338ac68 --- /dev/null +++ b/python-eventlet/eventlet/greenio/py3.py @@ -0,0 +1,192 @@ +import _pyio as _original_pyio +import errno +import os as _original_os +import socket as _original_socket +from io import ( + BufferedRandom as _OriginalBufferedRandom, + BufferedReader as _OriginalBufferedReader, + BufferedWriter as _OriginalBufferedWriter, + DEFAULT_BUFFER_SIZE, + TextIOWrapper as _OriginalTextIOWrapper, + IOBase as _OriginalIOBase, +) +from types import FunctionType + +from eventlet.greenio.base import ( + _operation_on_closed_file, + greenpipe_doc, + set_nonblocking, + SOCKET_BLOCKING, +) +from eventlet.hubs import notify_close, notify_opened, IOClosed, trampoline +from eventlet.support import get_errno, six + +__all__ = ['_fileobject', 'GreenPipe'] + +# TODO get rid of this, it only seems like the original _fileobject +_fileobject = _original_socket.SocketIO + +# Large part of the following code is copied from the original +# eventlet.greenio module + + +class GreenFileIO(_OriginalIOBase): + def __init__(self, name, mode='r', closefd=True, opener=None): + if isinstance(name, int): + fileno = name + self._name = "" % fileno + else: + assert isinstance(name, six.string_types) + with open(name, mode) as fd: + self._name = fd.name + fileno = _original_os.dup(fd.fileno()) + + notify_opened(fileno) + self._fileno = fileno + self._mode = mode + self._closed = False + set_nonblocking(self) + self._seekable = None + + @property + def closed(self): + return self._closed + + def seekable(self): + if self._seekable is None: + try: + _original_os.lseek(self._fileno, 0, _original_os.SEEK_CUR) + except IOError as e: + if get_errno(e) == errno.ESPIPE: + self._seekable = False + else: + raise + else: + self._seekable = True + + return self._seekable + + def readable(self): + return 'r' in self._mode or '+' in self._mode + + def writable(self): + return 'w' in self._mode or '+' in self._mode + + def fileno(self): + return self._fileno + + def read(self, buflen): + while True: + try: + return _original_os.read(self._fileno, buflen) + except OSError as e: + if get_errno(e) not in SOCKET_BLOCKING: + raise IOError(*e.args) + self._trampoline(self, read=True) + + def readinto(self, b): + up_to = len(b) + data = self.read(up_to) + bytes_read = len(data) + b[:bytes_read] = data + return bytes_read + + def isatty(self): + try: + return _original_os.isatty(self.fileno()) + except OSError as e: + raise IOError(*e.args) + + def _trampoline(self, fd, read=False, write=False, timeout=None, timeout_exc=None): + if self._closed: + # Don't trampoline if we're already closed. + raise IOClosed() + try: + return trampoline(fd, read=read, write=write, timeout=timeout, + timeout_exc=timeout_exc, + mark_as_closed=self._mark_as_closed) + except IOClosed: + # Our fileno has been obsoleted. Defang ourselves to + # prevent spurious closes. + self._mark_as_closed() + raise + + def _mark_as_closed(self): + """ Mark this socket as being closed """ + self._closed = True + + def write(self, data): + while True: + try: + return _original_os.write(self._fileno, data) + except OSError as e: + if get_errno(e) not in SOCKET_BLOCKING: + raise IOError(*e.args) + else: + trampoline(self, write=True) + + def close(self): + if not self._closed: + self._closed = True + _original_os.close(self._fileno) + notify_close(self._fileno) + for method in [ + 'fileno', 'flush', 'isatty', 'next', 'read', 'readinto', + 'readline', 'readlines', 'seek', 'tell', 'truncate', + 'write', 'xreadlines', '__iter__', '__next__', 'writelines']: + setattr(self, method, _operation_on_closed_file) + + def truncate(self, size=-1): + if size == -1: + size = self.tell() + try: + rv = _original_os.ftruncate(self._fileno, size) + except OSError as e: + raise IOError(*e.args) + else: + self.seek(size) # move position&clear buffer + return rv + + def seek(self, offset, whence=_original_os.SEEK_SET): + try: + return _original_os.lseek(self._fileno, offset, whence) + except OSError as e: + raise IOError(*e.args) + + def __enter__(self): + return self + + def __exit__(self, *args): + self.close() + + +_open_environment = dict(globals()) +_open_environment.update(dict( + BufferedRandom=_OriginalBufferedRandom, + BufferedWriter=_OriginalBufferedWriter, + BufferedReader=_OriginalBufferedReader, + TextIOWrapper=_OriginalTextIOWrapper, + FileIO=GreenFileIO, + os=_original_os, +)) + +_open = FunctionType( + six.get_function_code(_original_pyio.open), + _open_environment, +) + + +def GreenPipe(name, mode="r", buffering=-1, encoding=None, errors=None, + newline=None, closefd=True, opener=None): + try: + fileno = name.fileno() + except AttributeError: + pass + else: + fileno = _original_os.dup(fileno) + name.close() + name = fileno + + return _open(name, mode, buffering, encoding, errors, newline, closefd, opener) + +GreenPipe.__doc__ = greenpipe_doc diff --git a/eventlet/eventlet/greenpool.py b/python-eventlet/eventlet/greenpool.py similarity index 100% rename from eventlet/eventlet/greenpool.py rename to python-eventlet/eventlet/greenpool.py diff --git a/eventlet/eventlet/greenthread.py b/python-eventlet/eventlet/greenthread.py similarity index 100% rename from eventlet/eventlet/greenthread.py rename to python-eventlet/eventlet/greenthread.py diff --git a/eventlet/eventlet/hubs/__init__.py b/python-eventlet/eventlet/hubs/__init__.py similarity index 100% rename from eventlet/eventlet/hubs/__init__.py rename to python-eventlet/eventlet/hubs/__init__.py diff --git a/eventlet/eventlet/hubs/epolls.py b/python-eventlet/eventlet/hubs/epolls.py similarity index 100% rename from eventlet/eventlet/hubs/epolls.py rename to python-eventlet/eventlet/hubs/epolls.py diff --git a/eventlet/eventlet/hubs/hub.py b/python-eventlet/eventlet/hubs/hub.py similarity index 100% rename from eventlet/eventlet/hubs/hub.py rename to python-eventlet/eventlet/hubs/hub.py diff --git a/eventlet/eventlet/hubs/kqueue.py b/python-eventlet/eventlet/hubs/kqueue.py similarity index 100% rename from eventlet/eventlet/hubs/kqueue.py rename to python-eventlet/eventlet/hubs/kqueue.py diff --git a/eventlet/eventlet/hubs/poll.py b/python-eventlet/eventlet/hubs/poll.py similarity index 100% rename from eventlet/eventlet/hubs/poll.py rename to python-eventlet/eventlet/hubs/poll.py diff --git a/eventlet/eventlet/hubs/pyevent.py b/python-eventlet/eventlet/hubs/pyevent.py similarity index 100% rename from eventlet/eventlet/hubs/pyevent.py rename to python-eventlet/eventlet/hubs/pyevent.py diff --git a/eventlet/eventlet/hubs/selects.py b/python-eventlet/eventlet/hubs/selects.py similarity index 100% rename from eventlet/eventlet/hubs/selects.py rename to python-eventlet/eventlet/hubs/selects.py diff --git a/eventlet/eventlet/hubs/timer.py b/python-eventlet/eventlet/hubs/timer.py similarity index 100% rename from eventlet/eventlet/hubs/timer.py rename to python-eventlet/eventlet/hubs/timer.py diff --git a/eventlet/eventlet/patcher.py b/python-eventlet/eventlet/patcher.py similarity index 94% rename from eventlet/eventlet/patcher.py rename to python-eventlet/eventlet/patcher.py index ea31897..eb09f9a 100644 --- a/eventlet/eventlet/patcher.py +++ b/python-eventlet/eventlet/patcher.py @@ -223,8 +223,19 @@ def monkey_patch(**on): It's safe to call monkey_patch multiple times. """ accepted_args = set(('os', 'select', 'socket', - 'thread', 'time', 'psycopg', 'MySQLdb', '__builtin__')) + 'thread', 'time', 'psycopg', 'MySQLdb', + 'builtins')) + # To make sure only one of them is passed here + assert not ('__builtin__' in on and 'builtins' in on) + try: + b = on.pop('__builtin__') + except KeyError: + pass + else: + on['builtins'] = b + default_on = on.pop("all", None) + for k in six.iterkeys(on): if k not in accepted_args: raise TypeError("monkey_patch() got an unexpected " @@ -235,7 +246,7 @@ def monkey_patch(**on): if modname == 'MySQLdb': # MySQLdb is only on when explicitly patched for the moment on.setdefault(modname, False) - if modname == '__builtin__': + if modname == 'builtins': on.setdefault(modname, False) on.setdefault(modname, default_on) @@ -258,9 +269,9 @@ def monkey_patch(**on): if on.get('MySQLdb') and not already_patched.get('MySQLdb'): modules_to_patch += _green_MySQLdb() already_patched['MySQLdb'] = True - if on.get('__builtin__') and not already_patched.get('__builtin__'): + if on.get('builtins') and not already_patched.get('builtins'): modules_to_patch += _green_builtins() - already_patched['__builtin__'] = True + already_patched['builtins'] = True if on['psycopg'] and not already_patched.get('psycopg'): try: from eventlet.support import psycopg2_patcher @@ -293,6 +304,13 @@ def monkey_patch(**on): # importlib must use real thread locks, not eventlet.Semaphore importlib._bootstrap._thread = thread + # Issue #185: Since Python 3.3, threading.RLock is implemented in C and + # so call a C function to get the thread identifier, instead of calling + # threading.get_ident(). Force the Python implementation of RLock which + # calls threading.get_ident() and so is compatible with eventlet. + import threading + threading.RLock = threading._PyRLock + def is_monkey_patched(module): """Returns True if the given module is monkeypatched currently, False if @@ -351,7 +369,7 @@ def _green_MySQLdb(): def _green_builtins(): try: from eventlet.green import builtin - return [('__builtin__', builtin)] + return [('__builtin__' if six.PY2 else 'builtins', builtin)] except ImportError: return [] diff --git a/eventlet/eventlet/pools.py b/python-eventlet/eventlet/pools.py similarity index 100% rename from eventlet/eventlet/pools.py rename to python-eventlet/eventlet/pools.py diff --git a/eventlet/eventlet/queue.py b/python-eventlet/eventlet/queue.py similarity index 100% rename from eventlet/eventlet/queue.py rename to python-eventlet/eventlet/queue.py diff --git a/eventlet/eventlet/semaphore.py b/python-eventlet/eventlet/semaphore.py similarity index 90% rename from eventlet/eventlet/semaphore.py rename to python-eventlet/eventlet/semaphore.py index 73dbbc1..b2ef9d3 100644 --- a/eventlet/eventlet/semaphore.py +++ b/python-eventlet/eventlet/semaphore.py @@ -1,4 +1,7 @@ from __future__ import with_statement + +import collections + from eventlet import greenthread from eventlet import hubs from eventlet.timeout import Timeout @@ -35,7 +38,7 @@ class Semaphore(object): if value < 0: raise ValueError("Semaphore must be initialized with a positive " "number, got %s" % value) - self._waiters = set() + self._waiters = collections.deque() def __repr__(self): params = (self.__class__.__name__, hex(id(self)), @@ -75,13 +78,25 @@ class Semaphore(object): When invoked with blocking set to false, do not block. If a call without an argument would block, return false immediately; otherwise, do the same thing as when called without arguments, and return true. + + Timeout value must be strictly positive. """ - if not blocking and timeout is not None: - raise ValueError("can't specify timeout for non-blocking acquire") + if timeout == -1: + timeout = None + if timeout is not None and timeout < 0: + raise ValueError("timeout value must be strictly positive") + if not blocking: + if timeout is not None: + raise ValueError("can't specify timeout for non-blocking acquire") + timeout = 0 if not blocking and self.locked(): return False - if self.counter <= 0: - self._waiters.add(greenthread.getcurrent()) + + current_thread = greenthread.getcurrent() + + if self.counter <= 0 or self._waiters: + if current_thread not in self._waiters: + self._waiters.append(current_thread) try: if timeout is not None: ok = False @@ -92,10 +107,19 @@ class Semaphore(object): if not ok: return False else: - while self.counter <= 0: + # If someone else is already in this wait loop, give them + # a chance to get out. + while True: hubs.get_hub().switch() + if self.counter > 0: + break finally: - self._waiters.discard(greenthread.getcurrent()) + try: + self._waiters.remove(current_thread) + except ValueError: + # Fine if its already been dropped. + pass + self.counter -= 1 return True @@ -117,7 +141,7 @@ class Semaphore(object): def _do_acquire(self): if self._waiters and self.counter > 0: - waiter = self._waiters.pop() + waiter = self._waiters.popleft() waiter.switch() def __exit__(self, typ, val, tb): diff --git a/eventlet/eventlet/support/__init__.py b/python-eventlet/eventlet/support/__init__.py similarity index 100% rename from eventlet/eventlet/support/__init__.py rename to python-eventlet/eventlet/support/__init__.py diff --git a/python-eventlet/eventlet/support/greendns.py b/python-eventlet/eventlet/support/greendns.py new file mode 100644 index 0000000..7a23bb4 --- /dev/null +++ b/python-eventlet/eventlet/support/greendns.py @@ -0,0 +1,723 @@ +'''greendns - non-blocking DNS support for Eventlet +''' + +# Portions of this code taken from the gogreen project: +# http://github.com/slideinc/gogreen +# +# Copyright (c) 2005-2010 Slide, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# * Neither the name of the author nor the names of other +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import struct + +from eventlet import patcher +from eventlet.green import _socket_nodns +from eventlet.green import os +from eventlet.green import time +from eventlet.green import select +from eventlet.support import six + + +dns = patcher.import_patched('dns', + select=select, + time=time, + os=os, + socket=_socket_nodns) +dns.resolver = patcher.import_patched('dns.resolver', + select=select, + time=time, + os=os, + socket=_socket_nodns) + +for pkg in ('dns.entropy', 'dns.inet', 'dns.query'): + setattr(dns, pkg.split('.')[1], patcher.import_patched(pkg, + select=select, + time=time, + os=os, + socket=_socket_nodns)) +import dns.rdtypes +for pkg in ['dns.rdtypes.IN', 'dns.rdtypes.ANY']: + setattr(dns.rdtypes, pkg.split('.')[-1], patcher.import_patched(pkg)) +for pkg in ['dns.rdtypes.IN.A', 'dns.rdtypes.IN.AAAA']: + setattr(dns.rdtypes.IN, pkg.split('.')[-1], patcher.import_patched(pkg)) +for pkg in ['dns.rdtypes.ANY.CNAME']: + setattr(dns.rdtypes.ANY, pkg.split('.')[-1], patcher.import_patched(pkg)) + + +socket = _socket_nodns + +DNS_QUERY_TIMEOUT = 10.0 +HOSTS_TTL = 10.0 + +EAI_EAGAIN_ERROR = socket.gaierror(socket.EAI_AGAIN, 'Lookup timed out') +EAI_NODATA_ERROR = socket.gaierror(socket.EAI_NODATA, 'No address associated with hostname') +EAI_NONAME_ERROR = socket.gaierror(socket.EAI_NONAME, 'Name or service not known') + + +def is_ipv4_addr(host): + """Return True if host is a valid IPv4 address""" + if not isinstance(host, six.string_types): + return False + try: + dns.ipv4.inet_aton(host) + except dns.exception.SyntaxError: + return False + else: + return True + + +def is_ipv6_addr(host): + """Return True if host is a valid IPv6 address""" + if not isinstance(host, six.string_types): + return False + try: + dns.ipv6.inet_aton(host) + except dns.exception.SyntaxError: + return False + else: + return True + + +def is_ip_addr(host): + """Return True if host is a valid IPv4 or IPv6 address""" + return is_ipv4_addr(host) or is_ipv6_addr(host) + + +class HostsAnswer(dns.resolver.Answer): + """Answer class for HostsResolver object""" + + def __init__(self, qname, rdtype, rdclass, rrset, raise_on_no_answer=True): + """Create a new answer + + :qname: A dns.name.Name instance of the query name + :rdtype: The rdatatype of the query + :rdclass: The rdataclass of the query + :rrset: The dns.rrset.RRset with the response, must have ttl attribute + :raise_on_no_answer: Whether to raise dns.resolver.NoAnswer if no + answer. + """ + self.response = None + self.qname = qname + self.rdtype = rdtype + self.rdclass = rdclass + self.canonical_name = qname + if not rrset and raise_on_no_answer: + raise dns.resolver.NoAnswer() + self.rrset = rrset + self.expiration = (time.time() + + rrset.ttl if hasattr(rrset, 'ttl') else 0) + + +class HostsResolver(object): + """Class to parse the hosts file + + Attributes + ---------- + + :fname: The filename of the hosts file in use. + :interval: The time between checking for hosts file modification + """ + + def __init__(self, fname=None, interval=HOSTS_TTL): + self._v4 = {} # name -> ipv4 + self._v6 = {} # name -> ipv6 + self._aliases = {} # name -> cannonical_name + self.interval = interval + self.fname = fname + if fname is None: + if os.name == 'posix': + self.fname = '/etc/hosts' + elif os.name == 'nt': + self.fname = os.path.expandvars( + r'%SystemRoot%\system32\drivers\etc\hosts') + self._last_load = 0 + if self.fname: + self._load() + + def _readlines(self): + """Read the contents of the hosts file + + Return list of lines, comment lines and empty lines are + excluded. + + Note that this performs disk I/O so can be blocking. + """ + lines = [] + try: + with open(self.fname, 'rU') as fp: + for line in fp: + line = line.strip() + if line and line[0] != '#': + lines.append(line) + except (IOError, OSError): + pass + return lines + + def _load(self): + """Load hosts file + + This will unconditionally (re)load the data from the hosts + file. + """ + lines = self._readlines() + self._v4.clear() + self._v6.clear() + self._aliases.clear() + for line in lines: + parts = line.split() + if len(parts) < 2: + continue + ip = parts.pop(0) + if is_ipv4_addr(ip): + ipmap = self._v4 + elif is_ipv6_addr(ip): + if ip.startswith('fe80'): + # Do not use link-local addresses, OSX stores these here + continue + ipmap = self._v6 + else: + continue + cname = parts.pop(0) + ipmap[cname] = ip + for alias in parts: + ipmap[alias] = ip + self._aliases[alias] = cname + self._last_load = time.time() + + def query(self, qname, rdtype=dns.rdatatype.A, rdclass=dns.rdataclass.IN, + tcp=False, source=None, raise_on_no_answer=True): + """Query the hosts file + + The known rdtypes are dns.rdatatype.A, dns.rdatatype.AAAA and + dns.rdatatype.CNAME. + + The ``rdclass`` parameter must be dns.rdataclass.IN while the + ``tcp`` and ``source`` parameters are ignored. + + Return a HostAnswer instance or raise a dns.resolver.NoAnswer + exception. + """ + now = time.time() + if self._last_load + self.interval < now: + self._load() + rdclass = dns.rdataclass.IN + if isinstance(qname, six.string_types): + name = qname + qname = dns.name.from_text(qname) + else: + name = str(qname) + rrset = dns.rrset.RRset(qname, rdclass, rdtype) + rrset.ttl = self._last_load + self.interval - now + if rdclass == dns.rdataclass.IN and rdtype == dns.rdatatype.A: + addr = self._v4.get(name) + if not addr and qname.is_absolute(): + addr = self._v4.get(name[:-1]) + if addr: + rrset.add(dns.rdtypes.IN.A.A(rdclass, rdtype, addr)) + elif rdclass == dns.rdataclass.IN and rdtype == dns.rdatatype.AAAA: + addr = self._v6.get(name) + if not addr and qname.is_absolute(): + addr = self._v6.get(name[:-1]) + if addr: + rrset.add(dns.rdtypes.IN.AAAA.AAAA(rdclass, rdtype, addr)) + elif rdclass == dns.rdataclass.IN and rdtype == dns.rdatatype.CNAME: + cname = self._aliases.get(name) + if not cname and qname.is_absolute(): + cname = self._aliases.get(name[:-1]) + if cname: + rrset.add(dns.rdtypes.ANY.CNAME.CNAME( + rdclass, rdtype, dns.name.from_text(cname))) + return HostsAnswer(qname, rdtype, rdclass, rrset, raise_on_no_answer) + + def getaliases(self, hostname): + """Return a list of all the aliases of a given cname""" + # Due to the way store aliases this is a bit inefficient, this + # clearly was an afterthought. But this is only used by + # gethostbyname_ex so it's probably fine. + aliases = [] + if hostname in self._aliases: + cannon = self._aliases[hostname] + else: + cannon = hostname + aliases.append(cannon) + for alias, cname in six.iteritems(self._aliases): + if cannon == cname: + aliases.append(alias) + aliases.remove(hostname) + return aliases + + +class ResolverProxy(object): + """Resolver class which can also use /etc/hosts + + Initialise with a HostsResolver instance in order for it to also + use the hosts file. + """ + + def __init__(self, hosts_resolver=None, filename='/etc/resolv.conf'): + """Initialise the resolver proxy + + :param hosts_resolver: An instance of HostsResolver to use. + + :param filename: The filename containing the resolver + configuration. The default value is correct for both UNIX + and Windows, on Windows it will result in the configuration + being read from the Windows registry. + """ + self._hosts = hosts_resolver + self._filename = filename + self._resolver = dns.resolver.Resolver(filename=self._filename) + self._resolver.cache = dns.resolver.LRUCache() + + def clear(self): + self._resolver = dns.resolver.Resolver(filename=self._filename) + self._resolver.cache = dns.resolver.Cache() + + def query(self, qname, rdtype=dns.rdatatype.A, rdclass=dns.rdataclass.IN, + tcp=False, source=None, raise_on_no_answer=True): + """Query the resolver, using /etc/hosts if enabled""" + if qname is None: + qname = '0.0.0.0' + if rdclass == dns.rdataclass.IN and self._hosts: + try: + return self._hosts.query(qname, rdtype) + except dns.resolver.NoAnswer: + pass + return self._resolver.query(qname, rdtype, rdclass, + tcp, source, raise_on_no_answer) + + def getaliases(self, hostname): + """Return a list of all the aliases of a given hostname""" + if self._hosts: + aliases = self._hosts.getaliases(hostname) + else: + aliases = [] + while True: + try: + ans = self._resolver.query(hostname, dns.rdatatype.CNAME) + except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN): + break + else: + aliases.extend(str(rr.target) for rr in ans.rrset) + hostname = ans[0].target + return aliases + + +resolver = ResolverProxy(hosts_resolver=HostsResolver()) + + +def resolve(name, family=socket.AF_INET, raises=True): + """Resolve a name for a given family using the global resolver proxy + + This method is called by the global getaddrinfo() function. + + Return a dns.resolver.Answer instance. If there is no answer it's + rrset will be emtpy. + """ + if family == socket.AF_INET: + rdtype = dns.rdatatype.A + elif family == socket.AF_INET6: + rdtype = dns.rdatatype.AAAA + else: + raise socket.gaierror(socket.EAI_FAMILY, + 'Address family not supported') + try: + try: + return resolver.query(name, rdtype, raise_on_no_answer=raises) + except dns.resolver.NXDOMAIN: + if not raises: + return HostsAnswer(dns.name.Name(name), + rdtype, dns.rdataclass.IN, None, False) + raise + except dns.exception.Timeout: + raise EAI_EAGAIN_ERROR + except dns.exception.DNSException: + raise EAI_NODATA_ERROR + + +def resolve_cname(host): + """Return the canonical name of a hostname""" + try: + ans = resolver.query(host, dns.rdatatype.CNAME) + except dns.resolver.NoAnswer: + return host + except dns.exception.Timeout: + raise EAI_EAGAIN_ERROR + except dns.exception.DNSException: + raise EAI_NODATA_ERROR + else: + return str(ans[0].target) + + +def getaliases(host): + """Return a list of for aliases for the given hostname + + This method does translate the dnspython exceptions into + socket.gaierror exceptions. If no aliases are available an empty + list will be returned. + """ + try: + return resolver.getaliases(host) + except dns.exception.Timeout: + raise EAI_EAGAIN_ERROR + except dns.exception.DNSException: + raise EAI_NODATA_ERROR + + +def _getaddrinfo_lookup(host, family, flags): + """Resolve a hostname to a list of addresses + + Helper function for getaddrinfo. + """ + if flags & socket.AI_NUMERICHOST: + raise EAI_NONAME_ERROR + addrs = [] + if family == socket.AF_UNSPEC: + for qfamily in [socket.AF_INET6, socket.AF_INET]: + answer = resolve(host, qfamily, False) + if answer.rrset: + addrs.extend([rr.address for rr in answer.rrset]) + elif family == socket.AF_INET6 and flags & socket.AI_V4MAPPED: + answer = resolve(host, socket.AF_INET6, False) + if answer.rrset: + addrs = [rr.address for rr in answer.rrset] + if not addrs or flags & socket.AI_ALL: + answer = resolve(host, socket.AF_INET, False) + if answer.rrset: + addrs = ['::ffff:' + rr.address for rr in answer.rrset] + else: + answer = resolve(host, family, False) + if answer.rrset: + addrs = [rr.address for rr in answer.rrset] + return str(answer.qname), addrs + + +def getaddrinfo(host, port, family=0, socktype=0, proto=0, flags=0): + """Replacement for Python's socket.getaddrinfo + + This does the A and AAAA lookups asynchronously after which it + calls the OS' getaddrinfo(3) using the AI_NUMERICHOST flag. This + flag ensures getaddrinfo(3) does not use the network itself and + allows us to respect all the other arguments like the native OS. + """ + if isinstance(host, six.string_types): + host = host.encode('idna').decode('ascii') + if host is not None and not is_ip_addr(host): + qname, addrs = _getaddrinfo_lookup(host, family, flags) + else: + qname = host + addrs = [host] + aiflags = (flags | socket.AI_NUMERICHOST) & (0xffff ^ socket.AI_CANONNAME) + res = [] + err = None + for addr in addrs: + try: + ai = socket.getaddrinfo(addr, port, family, + socktype, proto, aiflags) + except socket.error as e: + if flags & socket.AI_ADDRCONFIG: + err = e + continue + raise + res.extend(ai) + if not res: + if err: + raise err + raise socket.gaierror(socket.EAI_NONAME, 'No address found') + if flags & socket.AI_CANONNAME: + if not is_ip_addr(qname): + qname = resolve_cname(qname).encode('ascii').decode('idna') + ai = res[0] + res[0] = (ai[0], ai[1], ai[2], qname, ai[4]) + return res + + +def gethostbyname(hostname): + """Replacement for Python's socket.gethostbyname""" + if is_ipv4_addr(hostname): + return hostname + rrset = resolve(hostname) + return rrset[0].address + + +def gethostbyname_ex(hostname): + """Replacement for Python's socket.gethostbyname_ex""" + if is_ipv4_addr(hostname): + return (hostname, [], [hostname]) + ans = resolve(hostname) + aliases = getaliases(hostname) + addrs = [rr.address for rr in ans.rrset] + qname = str(ans.qname) + if qname[-1] == '.': + qname = qname[:-1] + return (qname, aliases, addrs) + + +def getnameinfo(sockaddr, flags): + """Replacement for Python's socket.getnameinfo. + + Currently only supports IPv4. + """ + try: + host, port = sockaddr + except (ValueError, TypeError): + if not isinstance(sockaddr, tuple): + del sockaddr # to pass a stdlib test that is + # hyper-careful about reference counts + raise TypeError('getnameinfo() argument 1 must be a tuple') + else: + # must be ipv6 sockaddr, pretending we don't know how to resolve it + raise EAI_NONAME_ERROR + + if (flags & socket.NI_NAMEREQD) and (flags & socket.NI_NUMERICHOST): + # Conflicting flags. Punt. + raise EAI_NONAME_ERROR + + if is_ipv4_addr(host): + try: + rrset = resolver.query( + dns.reversename.from_address(host), dns.rdatatype.PTR) + if len(rrset) > 1: + raise socket.error('sockaddr resolved to multiple addresses') + host = rrset[0].target.to_text(omit_final_dot=True) + except dns.exception.Timeout: + if flags & socket.NI_NAMEREQD: + raise EAI_EAGAIN_ERROR + except dns.exception.DNSException: + if flags & socket.NI_NAMEREQD: + raise EAI_NONAME_ERROR + else: + try: + rrset = resolver.query(host) + if len(rrset) > 1: + raise socket.error('sockaddr resolved to multiple addresses') + if flags & socket.NI_NUMERICHOST: + host = rrset[0].address + except dns.exception.Timeout: + raise EAI_EAGAIN_ERROR + except dns.exception.DNSException: + raise socket.gaierror( + (socket.EAI_NODATA, 'No address associated with hostname')) + + if not (flags & socket.NI_NUMERICSERV): + proto = (flags & socket.NI_DGRAM) and 'udp' or 'tcp' + port = socket.getservbyport(port, proto) + + return (host, port) + + +def _net_read(sock, count, expiration): + """coro friendly replacement for dns.query._net_write + Read the specified number of bytes from sock. Keep trying until we + either get the desired amount, or we hit EOF. + A Timeout exception will be raised if the operation is not completed + by the expiration time. + """ + s = '' + while count > 0: + try: + n = sock.recv(count) + except socket.timeout: + # Q: Do we also need to catch coro.CoroutineSocketWake and pass? + if expiration - time.time() <= 0.0: + raise dns.exception.Timeout + if n == '': + raise EOFError + count = count - len(n) + s = s + n + return s + + +def _net_write(sock, data, expiration): + """coro friendly replacement for dns.query._net_write + Write the specified data to the socket. + A Timeout exception will be raised if the operation is not completed + by the expiration time. + """ + current = 0 + l = len(data) + while current < l: + try: + current += sock.send(data[current:]) + except socket.timeout: + # Q: Do we also need to catch coro.CoroutineSocketWake and pass? + if expiration - time.time() <= 0.0: + raise dns.exception.Timeout + + +def udp(q, where, timeout=DNS_QUERY_TIMEOUT, port=53, + af=None, source=None, source_port=0, ignore_unexpected=False): + """coro friendly replacement for dns.query.udp + Return the response obtained after sending a query via UDP. + + @param q: the query + @type q: dns.message.Message + @param where: where to send the message + @type where: string containing an IPv4 or IPv6 address + @param timeout: The number of seconds to wait before the query times out. + If None, the default, wait forever. + @type timeout: float + @param port: The port to which to send the message. The default is 53. + @type port: int + @param af: the address family to use. The default is None, which + causes the address family to use to be inferred from the form of of where. + If the inference attempt fails, AF_INET is used. + @type af: int + @rtype: dns.message.Message object + @param source: source address. The default is the IPv4 wildcard address. + @type source: string + @param source_port: The port from which to send the message. + The default is 0. + @type source_port: int + @param ignore_unexpected: If True, ignore responses from unexpected + sources. The default is False. + @type ignore_unexpected: bool""" + + wire = q.to_wire() + if af is None: + try: + af = dns.inet.af_for_address(where) + except: + af = dns.inet.AF_INET + if af == dns.inet.AF_INET: + destination = (where, port) + if source is not None: + source = (source, source_port) + elif af == dns.inet.AF_INET6: + destination = (where, port, 0, 0) + if source is not None: + source = (source, source_port, 0, 0) + + s = socket.socket(af, socket.SOCK_DGRAM) + s.settimeout(timeout) + try: + expiration = dns.query._compute_expiration(timeout) + if source is not None: + s.bind(source) + try: + s.sendto(wire, destination) + except socket.timeout: + # Q: Do we also need to catch coro.CoroutineSocketWake and pass? + if expiration - time.time() <= 0.0: + raise dns.exception.Timeout + while 1: + try: + (wire, from_address) = s.recvfrom(65535) + except socket.timeout: + # Q: Do we also need to catch coro.CoroutineSocketWake and pass? + if expiration - time.time() <= 0.0: + raise dns.exception.Timeout + if from_address == destination: + break + if not ignore_unexpected: + raise dns.query.UnexpectedSource( + 'got a response from %s instead of %s' + % (from_address, destination)) + finally: + s.close() + + r = dns.message.from_wire(wire, keyring=q.keyring, request_mac=q.mac) + if not q.is_response(r): + raise dns.query.BadResponse() + return r + + +def tcp(q, where, timeout=DNS_QUERY_TIMEOUT, port=53, + af=None, source=None, source_port=0): + """coro friendly replacement for dns.query.tcp + Return the response obtained after sending a query via TCP. + + @param q: the query + @type q: dns.message.Message object + @param where: where to send the message + @type where: string containing an IPv4 or IPv6 address + @param timeout: The number of seconds to wait before the query times out. + If None, the default, wait forever. + @type timeout: float + @param port: The port to which to send the message. The default is 53. + @type port: int + @param af: the address family to use. The default is None, which + causes the address family to use to be inferred from the form of of where. + If the inference attempt fails, AF_INET is used. + @type af: int + @rtype: dns.message.Message object + @param source: source address. The default is the IPv4 wildcard address. + @type source: string + @param source_port: The port from which to send the message. + The default is 0. + @type source_port: int""" + + wire = q.to_wire() + if af is None: + try: + af = dns.inet.af_for_address(where) + except: + af = dns.inet.AF_INET + if af == dns.inet.AF_INET: + destination = (where, port) + if source is not None: + source = (source, source_port) + elif af == dns.inet.AF_INET6: + destination = (where, port, 0, 0) + if source is not None: + source = (source, source_port, 0, 0) + s = socket.socket(af, socket.SOCK_STREAM) + s.settimeout(timeout) + try: + expiration = dns.query._compute_expiration(timeout) + if source is not None: + s.bind(source) + try: + s.connect(destination) + except socket.timeout: + # Q: Do we also need to catch coro.CoroutineSocketWake and pass? + if expiration - time.time() <= 0.0: + raise dns.exception.Timeout + + l = len(wire) + # copying the wire into tcpmsg is inefficient, but lets us + # avoid writev() or doing a short write that would get pushed + # onto the net + tcpmsg = struct.pack("!H", l) + wire + _net_write(s, tcpmsg, expiration) + ldata = _net_read(s, 2, expiration) + (l,) = struct.unpack("!H", ldata) + wire = _net_read(s, l, expiration) + finally: + s.close() + r = dns.message.from_wire(wire, keyring=q.keyring, request_mac=q.mac) + if not q.is_response(r): + raise dns.query.BadResponse() + return r + + +def reset(): + resolver.clear() + +# Install our coro-friendly replacements for the tcp and udp query methods. +dns.query.tcp = tcp +dns.query.udp = udp diff --git a/python-eventlet/eventlet/support/greenlets.py b/python-eventlet/eventlet/support/greenlets.py new file mode 100644 index 0000000..d4e1793 --- /dev/null +++ b/python-eventlet/eventlet/support/greenlets.py @@ -0,0 +1,8 @@ +import distutils.version + +import greenlet +getcurrent = greenlet.greenlet.getcurrent +GreenletExit = greenlet.greenlet.GreenletExit +preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__) + >= distutils.version.LooseVersion('0.3.2')) +greenlet = greenlet.greenlet diff --git a/eventlet/eventlet/support/psycopg2_patcher.py b/python-eventlet/eventlet/support/psycopg2_patcher.py similarity index 100% rename from eventlet/eventlet/support/psycopg2_patcher.py rename to python-eventlet/eventlet/support/psycopg2_patcher.py diff --git a/eventlet/eventlet/support/pylib.py b/python-eventlet/eventlet/support/pylib.py similarity index 100% rename from eventlet/eventlet/support/pylib.py rename to python-eventlet/eventlet/support/pylib.py diff --git a/eventlet/eventlet/support/six.py b/python-eventlet/eventlet/support/six.py similarity index 100% rename from eventlet/eventlet/support/six.py rename to python-eventlet/eventlet/support/six.py diff --git a/eventlet/eventlet/support/stacklesspypys.py b/python-eventlet/eventlet/support/stacklesspypys.py similarity index 100% rename from eventlet/eventlet/support/stacklesspypys.py rename to python-eventlet/eventlet/support/stacklesspypys.py diff --git a/eventlet/eventlet/support/stacklesss.py b/python-eventlet/eventlet/support/stacklesss.py similarity index 100% rename from eventlet/eventlet/support/stacklesss.py rename to python-eventlet/eventlet/support/stacklesss.py diff --git a/eventlet/eventlet/timeout.py b/python-eventlet/eventlet/timeout.py similarity index 100% rename from eventlet/eventlet/timeout.py rename to python-eventlet/eventlet/timeout.py diff --git a/eventlet/eventlet/tpool.py b/python-eventlet/eventlet/tpool.py similarity index 97% rename from eventlet/eventlet/tpool.py rename to python-eventlet/eventlet/tpool.py index e7f0db1..8d73814 100644 --- a/eventlet/eventlet/tpool.py +++ b/python-eventlet/eventlet/tpool.py @@ -292,6 +292,16 @@ def killall(): for thr in _threads: thr.join() del _threads[:] + + # return any remaining results + while not _rspq.empty(): + try: + (e, rv) = _rspq.get(block=False) + e.send(rv) + e = rv = None + except Empty: + pass + if _coro is not None: greenthread.kill(_coro) _rsock.close() diff --git a/eventlet/eventlet/websocket.py b/python-eventlet/eventlet/websocket.py similarity index 100% rename from eventlet/eventlet/websocket.py rename to python-eventlet/eventlet/websocket.py diff --git a/eventlet/eventlet/wsgi.py b/python-eventlet/eventlet/wsgi.py similarity index 94% rename from eventlet/eventlet/wsgi.py rename to python-eventlet/eventlet/wsgi.py index e69d107..7258277 100644 --- a/eventlet/eventlet/wsgi.py +++ b/python-eventlet/eventlet/wsgi.py @@ -8,12 +8,13 @@ import warnings from eventlet.green import BaseHTTPServer from eventlet.green import socket -from eventlet.green import urllib from eventlet import greenio from eventlet import greenpool from eventlet import support from eventlet.support import six +from eventlet.support.six.moves import urllib + DEFAULT_MAX_SIMULTANEOUS_REQUESTS = 1024 DEFAULT_MAX_HTTP_VERSION = 'HTTP/1.1' @@ -224,6 +225,33 @@ class HeadersTooLarge(Exception): pass +def get_logger(log, debug): + if callable(getattr(log, 'info', None)) \ + and callable(getattr(log, 'debug', None)): + return log + else: + return LoggerFileWrapper(log, debug) + + +class LoggerFileWrapper(object): + def __init__(self, log, debug): + self.log = log + self._debug = debug + + def info(self, msg, *args, **kwargs): + self.write(msg, *args) + + def debug(self, msg, *args, **kwargs): + if self._debug: + self.write(msg, *args) + + def write(self, msg, *args): + msg = msg + '\n' + if args: + msg = msg % args + self.log.write(msg) + + class FileObjectForHeaders(object): def __init__(self, fp): @@ -395,24 +423,8 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): towrite.append(six.b("%x" % (len(data),)) + b"\r\n" + data + b"\r\n") else: towrite.append(data) - try: - _writelines(towrite) - length[0] = length[0] + sum(map(len, towrite)) - except UnicodeEncodeError: - self.server.log_message( - "Encountered non-ascii unicode while attempting to write" - "wsgi response: %r" % - [x for x in towrite if isinstance(x, six.text_type)]) - self.server.log_message(traceback.format_exc()) - _writelines( - ["HTTP/1.1 500 Internal Server Error\r\n", - "Connection: close\r\n", - "Content-type: text/plain\r\n", - "Content-length: 98\r\n", - "Date: %s\r\n" % format_date_time(time.time()), - "\r\n", - ("Internal Server Error: wsgi application passed " - "a unicode object to the server instead of a string.")]) + _writelines(towrite) + length[0] = length[0] + sum(map(len, towrite)) def start_response(status, response_headers, exc_info=None): status_code[0] = status.split()[0] @@ -456,6 +468,9 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): minimum_write_chunk_size = int(self.environ.get( 'eventlet.minimum_write_chunk_size', self.minimum_chunk_size)) for data in result: + if isinstance(data, six.text_type): + data = data.encode('ascii') + towrite.append(data) towrite_size += len(data) if towrite_size >= minimum_write_chunk_size: @@ -471,8 +486,8 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): except Exception: self.close_connection = 1 tb = traceback.format_exc() - self.server.log_message(tb) - if not headers_set: + self.server.log.info(tb) + if not headers_sent: err_body = six.b(tb) if self.server.debug else b'' start_response("500 Internal Server Error", [('Content-type', 'text/plain'), @@ -497,7 +512,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): hook(self.environ, *args, **kwargs) if self.server.log_output: - self.server.log_message(self.server.log_format % { + self.server.log.info(self.server.log_format % { 'client_ip': self.get_client_ip(), 'client_port': self.client_address[1], 'date_time': self.log_date_time_string(), @@ -522,7 +537,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler): pq = self.path.split('?', 1) env['RAW_PATH_INFO'] = pq[0] - env['PATH_INFO'] = urllib.unquote(pq[0]) + env['PATH_INFO'] = urllib.parse.unquote(pq[0]) if len(pq) > 1: env['QUERY_STRING'] = pq[1] @@ -616,9 +631,9 @@ class Server(BaseHTTPServer.HTTPServer): self.socket = socket self.address = address if log: - self.log = log + self.log = get_logger(log, debug) else: - self.log = sys.stderr + self.log = get_logger(sys.stderr, debug) self.app = app self.keepalive = keepalive self.environ = environ @@ -672,12 +687,12 @@ class Server(BaseHTTPServer.HTTPServer): except socket.timeout: # Expected exceptions are not exceptional sock.close() - if self.debug: - # similar to logging "accepted" in server() - self.log_message('(%s) timed out %r' % (self.pid, address)) + # similar to logging "accepted" in server() + self.log.debug('(%s) timed out %r' % (self.pid, address)) def log_message(self, message): - self.log.write(message + '\n') + warnings.warn('server.log_message is deprecated. Please use server.log.info instead') + self.log.info(message) try: @@ -801,15 +816,14 @@ def server(sock, site, if port == ':80': port = '' - serv.log.write("(%s) wsgi starting up on %s://%s%s/\n" % ( + serv.log.info("(%s) wsgi starting up on %s://%s%s/" % ( serv.pid, scheme, host, port)) while is_accepting: try: client_socket = sock.accept() client_socket[0].settimeout(serv.socket_timeout) - if debug: - serv.log.write("(%s) accepted %r\n" % ( - serv.pid, client_socket[1])) + serv.log.debug("(%s) accepted %r" % ( + serv.pid, client_socket[1])) try: pool.spawn_n(serv.process_request, client_socket) except AttributeError: @@ -822,11 +836,11 @@ def server(sock, site, if support.get_errno(e) not in ACCEPT_ERRNO: raise except (KeyboardInterrupt, SystemExit): - serv.log.write("wsgi exiting\n") + serv.log.info("wsgi exiting") break finally: pool.waitall() - serv.log.write("(%s) wsgi exited, is_accepting=%s\n" % ( + serv.log.info("(%s) wsgi exited, is_accepting=%s" % ( serv.pid, is_accepting)) try: # NOTE: It's not clear whether we want this to leave the diff --git a/eventlet/examples/chat_bridge.py b/python-eventlet/examples/chat_bridge.py similarity index 100% rename from eventlet/examples/chat_bridge.py rename to python-eventlet/examples/chat_bridge.py diff --git a/eventlet/examples/chat_server.py b/python-eventlet/examples/chat_server.py similarity index 100% rename from eventlet/examples/chat_server.py rename to python-eventlet/examples/chat_server.py diff --git a/eventlet/examples/connect.py b/python-eventlet/examples/connect.py similarity index 100% rename from eventlet/examples/connect.py rename to python-eventlet/examples/connect.py diff --git a/eventlet/examples/distributed_websocket_chat.py b/python-eventlet/examples/distributed_websocket_chat.py similarity index 100% rename from eventlet/examples/distributed_websocket_chat.py rename to python-eventlet/examples/distributed_websocket_chat.py diff --git a/eventlet/examples/echoserver.py b/python-eventlet/examples/echoserver.py similarity index 100% rename from eventlet/examples/echoserver.py rename to python-eventlet/examples/echoserver.py diff --git a/eventlet/examples/feedscraper-testclient.py b/python-eventlet/examples/feedscraper-testclient.py similarity index 100% rename from eventlet/examples/feedscraper-testclient.py rename to python-eventlet/examples/feedscraper-testclient.py diff --git a/eventlet/examples/feedscraper.py b/python-eventlet/examples/feedscraper.py similarity index 100% rename from eventlet/examples/feedscraper.py rename to python-eventlet/examples/feedscraper.py diff --git a/eventlet/examples/forwarder.py b/python-eventlet/examples/forwarder.py similarity index 100% rename from eventlet/examples/forwarder.py rename to python-eventlet/examples/forwarder.py diff --git a/eventlet/examples/producer_consumer.py b/python-eventlet/examples/producer_consumer.py similarity index 100% rename from eventlet/examples/producer_consumer.py rename to python-eventlet/examples/producer_consumer.py diff --git a/eventlet/examples/recursive_crawler.py b/python-eventlet/examples/recursive_crawler.py similarity index 100% rename from eventlet/examples/recursive_crawler.py rename to python-eventlet/examples/recursive_crawler.py diff --git a/eventlet/examples/webcrawler.py b/python-eventlet/examples/webcrawler.py similarity index 100% rename from eventlet/examples/webcrawler.py rename to python-eventlet/examples/webcrawler.py diff --git a/eventlet/examples/websocket.html b/python-eventlet/examples/websocket.html similarity index 100% rename from eventlet/examples/websocket.html rename to python-eventlet/examples/websocket.html diff --git a/eventlet/examples/websocket.py b/python-eventlet/examples/websocket.py similarity index 100% rename from eventlet/examples/websocket.py rename to python-eventlet/examples/websocket.py diff --git a/eventlet/examples/websocket_chat.html b/python-eventlet/examples/websocket_chat.html similarity index 100% rename from eventlet/examples/websocket_chat.html rename to python-eventlet/examples/websocket_chat.html diff --git a/eventlet/examples/websocket_chat.py b/python-eventlet/examples/websocket_chat.py similarity index 100% rename from eventlet/examples/websocket_chat.py rename to python-eventlet/examples/websocket_chat.py diff --git a/eventlet/examples/wsgi.py b/python-eventlet/examples/wsgi.py similarity index 100% rename from eventlet/examples/wsgi.py rename to python-eventlet/examples/wsgi.py diff --git a/eventlet/examples/zmq_chat.py b/python-eventlet/examples/zmq_chat.py similarity index 100% rename from eventlet/examples/zmq_chat.py rename to python-eventlet/examples/zmq_chat.py diff --git a/eventlet/examples/zmq_simple.py b/python-eventlet/examples/zmq_simple.py similarity index 100% rename from eventlet/examples/zmq_simple.py rename to python-eventlet/examples/zmq_simple.py diff --git a/python-eventlet/setup.cfg b/python-eventlet/setup.cfg new file mode 100644 index 0000000..e57d130 --- /dev/null +++ b/python-eventlet/setup.cfg @@ -0,0 +1,2 @@ +[wheel] +universal = True diff --git a/eventlet/setup.py b/python-eventlet/setup.py similarity index 86% rename from eventlet/setup.py rename to python-eventlet/setup.py index 7a601d5..4ccc966 100644 --- a/eventlet/setup.py +++ b/python-eventlet/setup.py @@ -11,7 +11,7 @@ setup( author='Linden Lab', author_email='eventletdev@lists.secondlife.com', url='http://eventlet.net', - packages=find_packages(exclude=['tests', 'benchmarks']), + packages=find_packages(exclude=['benchmarks', 'tests', 'tests.*']), install_requires=( 'greenlet >= 0.3', ), @@ -31,6 +31,8 @@ setup( "Operating System :: Microsoft :: Windows", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", "Topic :: Internet", "Topic :: Software Development :: Libraries :: Python Modules", "Intended Audience :: Developers", diff --git a/python-eventlet/tests/README b/python-eventlet/tests/README new file mode 100644 index 0000000..4e28ae3 --- /dev/null +++ b/python-eventlet/tests/README @@ -0,0 +1,7 @@ +The tests are intended to be run using Nose. +http://somethingaboutorange.com/mrl/projects/nose/ + +To run tests, simply install nose, and then, in the eventlet tree, do: + $ nosetests + +That's it! Its output is the same as unittest's output. It tends to emit a lot of tracebacks from various poorly-behaving tests, but they still (generally) pass. \ No newline at end of file diff --git a/eventlet/tests/__init__.py b/python-eventlet/tests/__init__.py similarity index 82% rename from eventlet/tests/__init__.py rename to python-eventlet/tests/__init__.py index 3dba242..26c0c2e 100644 --- a/eventlet/tests/__init__.py +++ b/python-eventlet/tests/__init__.py @@ -1,8 +1,11 @@ # package is named tests, not test, so it won't be confused with test in stdlib from __future__ import print_function +import contextlib import errno +import functools import gc +import json import os try: import resource @@ -14,6 +17,8 @@ import sys import unittest import warnings +from nose.plugins.skip import SkipTest + import eventlet from eventlet import tpool @@ -22,22 +27,29 @@ from eventlet import tpool main = unittest.main -def skipped(func): - """ Decorator that marks a function as skipped. Uses nose's SkipTest exception - if installed. Without nose, this will count skipped tests as passing tests.""" +@contextlib.contextmanager +def assert_raises(exc_type): try: - from nose.plugins.skip import SkipTest + yield + except exc_type: + pass + else: + name = str(exc_type) + try: + name = exc_type.__name__ + except AttributeError: + pass + assert False, 'Expected exception {0}'.format(name) - def skipme(*a, **k): - raise SkipTest() - skipme.__name__ = func.__name__ - return skipme - except ImportError: - # no nose, we'll just skip the test ourselves - def skipme(*a, **k): - print(("Skipping {0}".format(func.__name__))) - skipme.__name__ = func.__name__ - return skipme + +def skipped(func, *decorator_args): + """Decorator that marks a function as skipped. + """ + @functools.wraps(func) + def wrapped(*a, **k): + raise SkipTest(*decorator_args) + + return wrapped def skip_if(condition): @@ -47,16 +59,16 @@ def skip_if(condition): should return True to skip the test. """ def skipped_wrapper(func): + @functools.wraps(func) def wrapped(*a, **kw): if isinstance(condition, bool): result = condition else: result = condition(func) if result: - return skipped(func)(*a, **kw) + raise SkipTest() else: return func(*a, **kw) - wrapped.__name__ = func.__name__ return wrapped return skipped_wrapper @@ -68,16 +80,16 @@ def skip_unless(condition): should return True if the condition is satisfied. """ def skipped_wrapper(func): + @functools.wraps(func) def wrapped(*a, **kw): if isinstance(condition, bool): result = condition else: result = condition(func) if not result: - return skipped(func)(*a, **kw) + raise SkipTest() else: return func(*a, **kw) - wrapped.__name__ = func.__name__ return wrapped return skipped_wrapper @@ -204,13 +216,23 @@ def check_idle_cpu_usage(duration, allowed_part): def verify_hub_empty(): + + def format_listener(listener): + return 'Listener %r for greenlet %r with run callback %r' % ( + listener, listener.greenlet, getattr(listener.greenlet, 'run', None)) + from eventlet import hubs hub = hubs.get_hub() - num_readers = len(hub.get_readers()) - num_writers = len(hub.get_writers()) + readers = hub.get_readers() + writers = hub.get_writers() + num_readers = len(readers) + num_writers = len(writers) num_timers = hub.get_timers_count() - assert num_readers == 0 and num_writers == 0, "Readers: %s Writers: %s" % ( - num_readers, num_writers) + assert num_readers == 0 and num_writers == 0, \ + "Readers: %s (%d) Writers: %s (%d)" % ( + ', '.join(map(format_listener, readers)), num_readers, + ', '.join(map(format_listener, writers)), num_writers, + ) def find_command(command): @@ -245,19 +267,10 @@ def get_database_auth(): ".test_dbauth", which contains a json map of parameters to the connect function. """ - import os retval = { 'MySQLdb': {'host': 'localhost', 'user': 'root', 'passwd': ''}, 'psycopg2': {'user': 'test'}, } - try: - import json - except ImportError: - try: - import simplejson as json - except ImportError: - print("No json implementation, using baked-in db credentials.") - return retval if 'EVENTLET_DB_TEST_AUTH' in os.environ: return json.loads(os.environ.get('EVENTLET_DB_TEST_AUTH')) @@ -268,7 +281,7 @@ def get_database_auth(): try: auth_utf8 = json.load(open(f)) # Have to convert unicode objects to str objects because - # mysqldb is dum. Using a doubly-nested list comprehension + # mysqldb is dumb. Using a doubly-nested list comprehension # because we know that the structure is a two-level dict. return dict( [(str(modname), dict( @@ -283,9 +296,9 @@ def run_python(path): if not path.endswith('.py'): path += '.py' path = os.path.abspath(path) - dir_ = os.path.dirname(path) + src_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) new_env = os.environ.copy() - new_env['PYTHONPATH'] = os.pathsep.join(sys.path + [dir_]) + new_env['PYTHONPATH'] = os.pathsep.join(sys.path + [src_dir]) p = subprocess.Popen( [sys.executable, path], env=new_env, @@ -297,5 +310,16 @@ def run_python(path): return output +def run_isolated(path, prefix='tests/isolated/'): + output = run_python(prefix + path).rstrip() + if output.startswith(b'skip'): + parts = output.split(b':', 1) + skip_args = [] + if len(parts) > 1: + skip_args.append(parts[1]) + raise SkipTest(*skip_args) + assert output == b'pass', output + + certificate_file = os.path.join(os.path.dirname(__file__), 'test_server.crt') private_key_file = os.path.join(os.path.dirname(__file__), 'test_server.key') diff --git a/eventlet/tests/api_test.py b/python-eventlet/tests/api_test.py similarity index 99% rename from eventlet/tests/api_test.py rename to python-eventlet/tests/api_test.py index f9636da..1cdab88 100644 --- a/eventlet/tests/api_test.py +++ b/python-eventlet/tests/api_test.py @@ -17,7 +17,7 @@ def check_hub(): for nm in 'get_readers', 'get_writers': dct = getattr(hub, nm)() assert not dct, "hub.%s not empty: %s" % (nm, dct) - hub.abort(True) + hub.abort(wait=True) assert not hub.running diff --git a/eventlet/tests/backdoor_test.py b/python-eventlet/tests/backdoor_test.py similarity index 100% rename from eventlet/tests/backdoor_test.py rename to python-eventlet/tests/backdoor_test.py diff --git a/eventlet/tests/convenience_test.py b/python-eventlet/tests/convenience_test.py similarity index 100% rename from eventlet/tests/convenience_test.py rename to python-eventlet/tests/convenience_test.py diff --git a/eventlet/tests/db_pool_test.py b/python-eventlet/tests/db_pool_test.py similarity index 100% rename from eventlet/tests/db_pool_test.py rename to python-eventlet/tests/db_pool_test.py diff --git a/eventlet/tests/debug_test.py b/python-eventlet/tests/debug_test.py similarity index 100% rename from eventlet/tests/debug_test.py rename to python-eventlet/tests/debug_test.py diff --git a/eventlet/tests/env_test.py b/python-eventlet/tests/env_test.py similarity index 100% rename from eventlet/tests/env_test.py rename to python-eventlet/tests/env_test.py diff --git a/eventlet/tests/event_test.py b/python-eventlet/tests/event_test.py similarity index 100% rename from eventlet/tests/event_test.py rename to python-eventlet/tests/event_test.py diff --git a/eventlet/tests/fork_test.py b/python-eventlet/tests/fork_test.py similarity index 100% rename from eventlet/tests/fork_test.py rename to python-eventlet/tests/fork_test.py diff --git a/python-eventlet/tests/greendns_test.py b/python-eventlet/tests/greendns_test.py new file mode 100644 index 0000000..d8112c9 --- /dev/null +++ b/python-eventlet/tests/greendns_test.py @@ -0,0 +1,810 @@ +# coding: utf-8 +"""Tests for the eventlet.support.greendns module""" + +import os +import socket +import tempfile +import time + +import tests +from tests import mock +try: + import dns.rdatatype + import dns.rdtypes.IN.A + import dns.rdtypes.IN.AAAA + import dns.resolver + import dns.reversename + import dns.rrset + from eventlet.support import greendns + greendns_available = True +except ImportError: + greendns_available = False + greendns = mock.Mock() + + +def greendns_requirement(_f): + """We want to skip tests if greendns is not installed. + """ + return greendns_available + + +class TestHostsResolver(tests.LimitedTestCase): + + def _make_host_resolver(self): + """Returns a HostResolver instance + + The hosts file will be empty but accessible as a py.path.local + instance using the ``hosts`` attribute. + """ + hosts = tempfile.NamedTemporaryFile() + hr = greendns.HostsResolver(fname=hosts.name) + hr.hosts = hosts + hr._last_stat = 0 + return hr + + @tests.skip_unless(greendns_requirement) + def test_default_fname(self): + hr = greendns.HostsResolver() + assert os.path.exists(hr.fname) + + @tests.skip_unless(greendns_requirement) + def test_readlines_lines(self): + hr = self._make_host_resolver() + hr.hosts.write(b'line0\n') + hr.hosts.flush() + assert hr._readlines() == ['line0'] + hr._last_stat = 0 + hr.hosts.write(b'line1\n') + hr.hosts.flush() + assert hr._readlines() == ['line0', 'line1'] + hr._last_stat = 0 + hr.hosts.write(b'#comment0\nline0\n #comment1\nline1') + assert hr._readlines() == ['line0', 'line1'] + + @tests.skip_unless(greendns_requirement) + def test_readlines_missing_file(self): + hr = self._make_host_resolver() + hr.hosts.close() + hr._last_stat = 0 + assert hr._readlines() == [] + + @tests.skip_unless(greendns_requirement) + def test_load_no_contents(self): + hr = self._make_host_resolver() + hr._load() + assert not hr._v4 + assert not hr._v6 + assert not hr._aliases + + @tests.skip_unless(greendns_requirement) + def test_load_v4_v6_cname_aliases(self): + hr = self._make_host_resolver() + hr.hosts.write(b'1.2.3.4 v4.example.com v4\n' + b'dead:beef::1 v6.example.com v6\n') + hr.hosts.flush() + hr._load() + assert hr._v4 == {'v4.example.com': '1.2.3.4', 'v4': '1.2.3.4'} + assert hr._v6 == {'v6.example.com': 'dead:beef::1', + 'v6': 'dead:beef::1'} + assert hr._aliases == {'v4': 'v4.example.com', + 'v6': 'v6.example.com'} + + @tests.skip_unless(greendns_requirement) + def test_load_v6_link_local(self): + hr = self._make_host_resolver() + hr.hosts.write(b'fe80:: foo\n' + b'fe80:dead:beef::1 bar\n') + hr.hosts.flush() + hr._load() + assert not hr._v4 + assert not hr._v6 + + @tests.skip_unless(greendns_requirement) + def test_query_A(self): + hr = self._make_host_resolver() + hr._v4 = {'v4.example.com': '1.2.3.4'} + ans = hr.query('v4.example.com') + assert ans[0].address == '1.2.3.4' + + @tests.skip_unless(greendns_requirement) + def test_query_ans_types(self): + # This assumes test_query_A above succeeds + hr = self._make_host_resolver() + hr._v4 = {'v4.example.com': '1.2.3.4'} + hr._last_stat = time.time() + ans = hr.query('v4.example.com') + assert isinstance(ans, greendns.dns.resolver.Answer) + assert ans.response is None + assert ans.qname == dns.name.from_text('v4.example.com') + assert ans.rdtype == dns.rdatatype.A + assert ans.rdclass == dns.rdataclass.IN + assert ans.canonical_name == dns.name.from_text('v4.example.com') + assert ans.expiration + assert isinstance(ans.rrset, dns.rrset.RRset) + assert ans.rrset.rdtype == dns.rdatatype.A + assert ans.rrset.rdclass == dns.rdataclass.IN + ttl = greendns.HOSTS_TTL + assert ttl - 1 <= ans.rrset.ttl <= ttl + 1 + rr = ans.rrset[0] + assert isinstance(rr, greendns.dns.rdtypes.IN.A.A) + assert rr.rdtype == dns.rdatatype.A + assert rr.rdclass == dns.rdataclass.IN + assert rr.address == '1.2.3.4' + + @tests.skip_unless(greendns_requirement) + def test_query_AAAA(self): + hr = self._make_host_resolver() + hr._v6 = {'v6.example.com': 'dead:beef::1'} + ans = hr.query('v6.example.com', dns.rdatatype.AAAA) + assert ans[0].address == 'dead:beef::1' + + @tests.skip_unless(greendns_requirement) + def test_query_unknown_raises(self): + hr = self._make_host_resolver() + with tests.assert_raises(greendns.dns.resolver.NoAnswer): + hr.query('example.com') + + @tests.skip_unless(greendns_requirement) + def test_query_unknown_no_raise(self): + hr = self._make_host_resolver() + ans = hr.query('example.com', raise_on_no_answer=False) + assert isinstance(ans, greendns.dns.resolver.Answer) + assert ans.response is None + assert ans.qname == dns.name.from_text('example.com') + assert ans.rdtype == dns.rdatatype.A + assert ans.rdclass == dns.rdataclass.IN + assert ans.canonical_name == dns.name.from_text('example.com') + assert ans.expiration + assert isinstance(ans.rrset, greendns.dns.rrset.RRset) + assert ans.rrset.rdtype == dns.rdatatype.A + assert ans.rrset.rdclass == dns.rdataclass.IN + assert len(ans.rrset) == 0 + + @tests.skip_unless(greendns_requirement) + def test_query_CNAME(self): + hr = self._make_host_resolver() + hr._aliases = {'host': 'host.example.com'} + ans = hr.query('host', dns.rdatatype.CNAME) + assert ans[0].target == dns.name.from_text('host.example.com') + assert str(ans[0].target) == 'host.example.com.' + + @tests.skip_unless(greendns_requirement) + def test_query_unknown_type(self): + hr = self._make_host_resolver() + with tests.assert_raises(greendns.dns.resolver.NoAnswer): + hr.query('example.com', dns.rdatatype.MX) + + @tests.skip_unless(greendns_requirement) + def test_getaliases(self): + hr = self._make_host_resolver() + hr._aliases = {'host': 'host.example.com', + 'localhost': 'host.example.com'} + res = set(hr.getaliases('host')) + assert res == set(['host.example.com', 'localhost']) + + @tests.skip_unless(greendns_requirement) + def test_getaliases_unknown(self): + hr = self._make_host_resolver() + assert hr.getaliases('host.example.com') == [] + + @tests.skip_unless(greendns_requirement) + def test_getaliases_fqdn(self): + hr = self._make_host_resolver() + hr._aliases = {'host': 'host.example.com'} + res = set(hr.getaliases('host.example.com')) + assert res == set(['host']) + + +def _make_mock_base_resolver(): + """A mocked base resolver class""" + class RR(object): + pass + + class Resolver(object): + aliases = ['cname.example.com'] + raises = None + rr = RR() + + def query(self, *args, **kwargs): + self.args = args + self.kwargs = kwargs + if self.raises: + raise self.raises() + if hasattr(self, 'rrset'): + rrset = self.rrset + else: + rrset = [self.rr] + return greendns.HostsAnswer('foo', 1, 1, rrset, False) + + def getaliases(self, *args, **kwargs): + return self.aliases + + return Resolver + + +class TestProxyResolver(tests.LimitedTestCase): + + @tests.skip_unless(greendns_requirement) + def test_clear(self): + rp = greendns.ResolverProxy() + resolver = rp._resolver + rp.clear() + assert rp._resolver != resolver + + @tests.skip_unless(greendns_requirement) + def _make_mock_hostsresolver(self): + """A mocked HostsResolver""" + base_resolver = _make_mock_base_resolver() + base_resolver.rr.address = '1.2.3.4' + return base_resolver() + + @tests.skip_unless(greendns_requirement) + def _make_mock_resolver(self): + """A mocked Resolver""" + base_resolver = _make_mock_base_resolver() + base_resolver.rr.address = '5.6.7.8' + return base_resolver() + + @tests.skip_unless(greendns_requirement) + def test_hosts(self): + hostsres = self._make_mock_hostsresolver() + rp = greendns.ResolverProxy(hostsres) + ans = rp.query('host.example.com') + assert ans[0].address == '1.2.3.4' + + @tests.skip_unless(greendns_requirement) + def test_hosts_noanswer(self): + hostsres = self._make_mock_hostsresolver() + res = self._make_mock_resolver() + rp = greendns.ResolverProxy(hostsres) + rp._resolver = res + hostsres.raises = greendns.dns.resolver.NoAnswer + ans = rp.query('host.example.com') + assert ans[0].address == '5.6.7.8' + + @tests.skip_unless(greendns_requirement) + def test_resolver(self): + res = self._make_mock_resolver() + rp = greendns.ResolverProxy() + rp._resolver = res + ans = rp.query('host.example.com') + assert ans[0].address == '5.6.7.8' + + @tests.skip_unless(greendns_requirement) + def test_noanswer(self): + res = self._make_mock_resolver() + rp = greendns.ResolverProxy() + rp._resolver = res + res.raises = greendns.dns.resolver.NoAnswer + with tests.assert_raises(greendns.dns.resolver.NoAnswer): + rp.query('host.example.com') + + @tests.skip_unless(greendns_requirement) + def test_nxdomain(self): + res = self._make_mock_resolver() + rp = greendns.ResolverProxy() + rp._resolver = res + res.raises = greendns.dns.resolver.NXDOMAIN + with tests.assert_raises(greendns.dns.resolver.NXDOMAIN): + rp.query('host.example.com') + + @tests.skip_unless(greendns_requirement) + def test_noanswer_hosts(self): + hostsres = self._make_mock_hostsresolver() + res = self._make_mock_resolver() + rp = greendns.ResolverProxy(hostsres) + rp._resolver = res + hostsres.raises = greendns.dns.resolver.NoAnswer + res.raises = greendns.dns.resolver.NoAnswer + with tests.assert_raises(greendns.dns.resolver.NoAnswer): + rp.query('host.example.com') + + def _make_mock_resolver_aliases(self): + + class RR(object): + target = 'host.example.com' + + class Resolver(object): + call_count = 0 + exc_type = greendns.dns.resolver.NoAnswer + + def query(self, *args, **kwargs): + self.args = args + self.kwargs = kwargs + self.call_count += 1 + if self.call_count < 2: + return greendns.HostsAnswer(args[0], 1, 5, [RR()], False) + else: + raise self.exc_type() + + return Resolver() + + @tests.skip_unless(greendns_requirement) + def test_getaliases(self): + aliases_res = self._make_mock_resolver_aliases() + rp = greendns.ResolverProxy() + rp._resolver = aliases_res + aliases = set(rp.getaliases('alias.example.com')) + assert aliases == set(['host.example.com']) + + @tests.skip_unless(greendns_requirement) + def test_getaliases_fqdn(self): + aliases_res = self._make_mock_resolver_aliases() + rp = greendns.ResolverProxy() + rp._resolver = aliases_res + rp._resolver.call_count = 1 + assert rp.getaliases('host.example.com') == [] + + @tests.skip_unless(greendns_requirement) + def test_getaliases_nxdomain(self): + aliases_res = self._make_mock_resolver_aliases() + rp = greendns.ResolverProxy() + rp._resolver = aliases_res + rp._resolver.call_count = 1 + rp._resolver.exc_type = greendns.dns.resolver.NXDOMAIN + assert rp.getaliases('host.example.com') == [] + + +class TestResolve(tests.LimitedTestCase): + + def setUp(self): + base_resolver = _make_mock_base_resolver() + base_resolver.rr.address = '1.2.3.4' + self._old_resolver = greendns.resolver + greendns.resolver = base_resolver() + + def tearDown(self): + greendns.resolver = self._old_resolver + + @tests.skip_unless(greendns_requirement) + def test_A(self): + ans = greendns.resolve('host.example.com', socket.AF_INET) + assert ans[0].address == '1.2.3.4' + assert greendns.resolver.args == ('host.example.com', dns.rdatatype.A) + + @tests.skip_unless(greendns_requirement) + def test_AAAA(self): + greendns.resolver.rr.address = 'dead:beef::1' + ans = greendns.resolve('host.example.com', socket.AF_INET6) + assert ans[0].address == 'dead:beef::1' + assert greendns.resolver.args == ('host.example.com', dns.rdatatype.AAAA) + + @tests.skip_unless(greendns_requirement) + def test_unknown_rdtype(self): + with tests.assert_raises(socket.gaierror): + greendns.resolve('host.example.com', socket.AF_INET6 + 1) + + @tests.skip_unless(greendns_requirement) + def test_timeout(self): + greendns.resolver.raises = greendns.dns.exception.Timeout + with tests.assert_raises(socket.gaierror): + greendns.resolve('host.example.com') + + @tests.skip_unless(greendns_requirement) + def test_exc(self): + greendns.resolver.raises = greendns.dns.exception.DNSException + with tests.assert_raises(socket.gaierror): + greendns.resolve('host.example.com') + + @tests.skip_unless(greendns_requirement) + def test_noraise_noanswer(self): + greendns.resolver.rrset = None + ans = greendns.resolve('example.com', raises=False) + assert not ans.rrset + + @tests.skip_unless(greendns_requirement) + def test_noraise_nxdomain(self): + greendns.resolver.raises = greendns.dns.resolver.NXDOMAIN + ans = greendns.resolve('example.com', raises=False) + assert not ans.rrset + + +class TestResolveCname(tests.LimitedTestCase): + + def setUp(self): + base_resolver = _make_mock_base_resolver() + base_resolver.rr.target = 'cname.example.com' + self._old_resolver = greendns.resolver + greendns.resolver = base_resolver() + + def tearDown(self): + greendns.resolver = self._old_resolver + + @tests.skip_unless(greendns_requirement) + def test_success(self): + cname = greendns.resolve_cname('alias.example.com') + assert cname == 'cname.example.com' + + @tests.skip_unless(greendns_requirement) + def test_timeout(self): + greendns.resolver.raises = greendns.dns.exception.Timeout + with tests.assert_raises(socket.gaierror): + greendns.resolve_cname('alias.example.com') + + @tests.skip_unless(greendns_requirement) + def test_nodata(self): + greendns.resolver.raises = greendns.dns.exception.DNSException + with tests.assert_raises(socket.gaierror): + greendns.resolve_cname('alias.example.com') + + @tests.skip_unless(greendns_requirement) + def test_no_answer(self): + greendns.resolver.raises = greendns.dns.resolver.NoAnswer + assert greendns.resolve_cname('host.example.com') == 'host.example.com' + + +def _make_mock_resolve(): + """A stubbed out resolve function + + This monkeypatches the greendns.resolve() function with a mock. + You must give it answers by calling .add(). + """ + + class MockAnswer(list): + pass + + class MockResolve(object): + + def __init__(self): + self.answers = {} + + def __call__(self, name, family=socket.AF_INET, raises=True): + qname = dns.name.from_text(name) + try: + rrset = self.answers[name][family] + except KeyError: + if raises: + raise greendns.dns.resolver.NoAnswer() + rrset = dns.rrset.RRset(qname, 1, 1) + ans = MockAnswer() + ans.qname = qname + ans.rrset = rrset + ans.extend(rrset.items) + return ans + + def add(self, name, addr): + """Add an address to a name and family""" + try: + rdata = dns.rdtypes.IN.A.A(dns.rdataclass.IN, + dns.rdatatype.A, addr) + family = socket.AF_INET + except (socket.error, dns.exception.SyntaxError): + rdata = dns.rdtypes.IN.AAAA.AAAA(dns.rdataclass.IN, + dns.rdatatype.AAAA, addr) + family = socket.AF_INET6 + family_dict = self.answers.setdefault(name, {}) + rrset = family_dict.get(family) + if not rrset: + family_dict[family] = rrset = dns.rrset.RRset( + dns.name.from_text(name), rdata.rdclass, rdata.rdtype) + rrset.add(rdata) + + resolve = MockResolve() + return resolve + + +class TestGetaddrinfo(tests.LimitedTestCase): + + def _make_mock_resolve_cname(self): + """A stubbed out cname function""" + + class ResolveCname(object): + qname = None + cname = 'cname.example.com' + + def __call__(self, host): + self.qname = host + return self.cname + + resolve_cname = ResolveCname() + return resolve_cname + + def setUp(self): + self._old_resolve = greendns.resolve + self._old_resolve_cname = greendns.resolve_cname + self._old_orig_getaddrinfo = greendns.socket.getaddrinfo + + def tearDown(self): + greendns.resolve = self._old_resolve + greendns.resolve_cname = self._old_resolve_cname + greendns.socket.getaddrinfo = self._old_orig_getaddrinfo + + @tests.skip_unless(greendns_requirement) + def test_getaddrinfo(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '127.0.0.2') + greendns.resolve.add('example.com', '::1') + res = greendns.getaddrinfo('example.com', 'ssh') + addr = ('127.0.0.2', 22) + tcp = (socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr) + udp = (socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr) + addr = ('::1', 22, 0, 0) + tcp6 = (socket.AF_INET6, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr) + udp6 = (socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr) + filt_res = [ai[:3] + (ai[4],) for ai in res] + assert tcp in filt_res + assert udp in filt_res + assert tcp6 in filt_res + assert udp6 in filt_res + + @tests.skip_unless(greendns_requirement) + def test_getaddrinfo_idn(self): + greendns.resolve = _make_mock_resolve() + idn_name = u'евентлет.com' + greendns.resolve.add(idn_name.encode('idna').decode('ascii'), '127.0.0.2') + res = greendns.getaddrinfo(idn_name, 'ssh') + addr = ('127.0.0.2', 22) + tcp = (socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr) + udp = (socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr) + filt_res = [ai[:3] + (ai[4],) for ai in res] + assert tcp in filt_res + assert udp in filt_res + + @tests.skip_unless(greendns_requirement) + def test_getaddrinfo_inet(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '127.0.0.2') + res = greendns.getaddrinfo('example.com', 'ssh', socket.AF_INET) + addr = ('127.0.0.2', 22) + tcp = (socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr) + udp = (socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr) + assert tcp in [ai[:3] + (ai[4],) for ai in res] + assert udp in [ai[:3] + (ai[4],) for ai in res] + + @tests.skip_unless(greendns_requirement) + def test_getaddrinfo_inet6(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '::1') + res = greendns.getaddrinfo('example.com', 'ssh', socket.AF_INET6) + addr = ('::1', 22, 0, 0) + tcp = (socket.AF_INET6, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr) + udp = (socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr) + assert tcp in [ai[:3] + (ai[4],) for ai in res] + assert udp in [ai[:3] + (ai[4],) for ai in res] + + @tests.skip_unless(greendns_requirement) + def test_getaddrinfo_only_a_ans(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '1.2.3.4') + res = greendns.getaddrinfo('example.com', 0) + addr = [('1.2.3.4', 0)] * len(res) + assert addr == [ai[-1] for ai in res] + + @tests.skip_unless(greendns_requirement) + def test_getaddrinfo_only_aaaa_ans(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', 'dead:beef::1') + res = greendns.getaddrinfo('example.com', 0) + addr = [('dead:beef::1', 0, 0, 0)] * len(res) + assert addr == [ai[-1] for ai in res] + + @tests.skip_unless(greendns_requirement) + def test_canonname(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('host.example.com', '1.2.3.4') + greendns.resolve_cname = self._make_mock_resolve_cname() + res = greendns.getaddrinfo('host.example.com', 0, + 0, 0, 0, socket.AI_CANONNAME) + assert res[0][3] == 'cname.example.com' + + @tests.skip_unless(greendns_requirement) + def test_host_none(self): + res = greendns.getaddrinfo(None, 80) + for addr in set(ai[-1] for ai in res): + assert addr in [('127.0.0.1', 80), ('::1', 80, 0, 0)] + + @tests.skip_unless(greendns_requirement) + def test_host_none_passive(self): + res = greendns.getaddrinfo(None, 80, 0, 0, 0, socket.AI_PASSIVE) + for addr in set(ai[-1] for ai in res): + assert addr in [('0.0.0.0', 80), ('::', 80, 0, 0)] + + @tests.skip_unless(greendns_requirement) + def test_v4mapped(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '1.2.3.4') + res = greendns.getaddrinfo('example.com', 80, + socket.AF_INET6, 0, 0, socket.AI_V4MAPPED) + addrs = set(ai[-1] for ai in res) + assert addrs == set([('::ffff:1.2.3.4', 80, 0, 0)]) + + @tests.skip_unless(greendns_requirement) + def test_v4mapped_all(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '1.2.3.4') + greendns.resolve.add('example.com', 'dead:beef::1') + res = greendns.getaddrinfo('example.com', 80, socket.AF_INET6, 0, 0, + socket.AI_V4MAPPED | socket.AI_ALL) + addrs = set(ai[-1] for ai in res) + for addr in addrs: + assert addr in [('::ffff:1.2.3.4', 80, 0, 0), + ('dead:beef::1', 80, 0, 0)] + + @tests.skip_unless(greendns_requirement) + def test_numericserv(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '1.2.3.4') + with tests.assert_raises(socket.gaierror): + greendns.getaddrinfo('example.com', 'www', 0, 0, 0, socket.AI_NUMERICSERV) + + @tests.skip_unless(greendns_requirement) + def test_numerichost(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '1.2.3.4') + with tests.assert_raises(socket.gaierror): + greendns.getaddrinfo('example.com', 80, 0, 0, 0, socket.AI_NUMERICHOST) + + @tests.skip_unless(greendns_requirement) + def test_noport(self): + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('example.com', '1.2.3.4') + ai = greendns.getaddrinfo('example.com', None) + assert ai[0][-1][1] == 0 + + @tests.skip_unless(greendns_requirement) + def test_AI_ADDRCONFIG(self): + # When the users sets AI_ADDRCONFIG but only has an IPv4 + # address configured we will iterate over the results, but the + # call for the IPv6 address will fail rather then return an + # empty list. In that case we should catch the exception and + # only return the ones which worked. + def getaddrinfo(addr, port, family, socktype, proto, aiflags): + if addr == '127.0.0.1': + return [(socket.AF_INET, 1, 0, '', ('127.0.0.1', 0))] + elif addr == '::1' and aiflags & socket.AI_ADDRCONFIG: + raise socket.error(socket.EAI_ADDRFAMILY, + 'Address family for hostname not supported') + elif addr == '::1' and not aiflags & socket.AI_ADDRCONFIG: + return [(socket.AF_INET6, 1, 0, '', ('::1', 0, 0, 0))] + greendns.socket.getaddrinfo = getaddrinfo + greendns.resolve = _make_mock_resolve() + greendns.resolve.add('localhost', '127.0.0.1') + greendns.resolve.add('localhost', '::1') + res = greendns.getaddrinfo('localhost', None, + 0, 0, 0, socket.AI_ADDRCONFIG) + assert res == [(socket.AF_INET, 1, 0, '', ('127.0.0.1', 0))] + + @tests.skip_unless(greendns_requirement) + def test_AI_ADDRCONFIG_noaddr(self): + # If AI_ADDRCONFIG is used but there is no address we need to + # get an exception, not an empty list. + def getaddrinfo(addr, port, family, socktype, proto, aiflags): + raise socket.error(socket.EAI_ADDRFAMILY, + 'Address family for hostname not supported') + greendns.socket.getaddrinfo = getaddrinfo + greendns.resolve = _make_mock_resolve() + try: + greendns.getaddrinfo('::1', None, 0, 0, 0, socket.AI_ADDRCONFIG) + except socket.error as e: + assert e.errno == socket.EAI_ADDRFAMILY + + +class TestIsIpAddr(tests.LimitedTestCase): + + @tests.skip_unless(greendns_requirement) + def test_isv4(self): + assert greendns.is_ipv4_addr('1.2.3.4') + + @tests.skip_unless(greendns_requirement) + def test_isv4_false(self): + assert not greendns.is_ipv4_addr('260.0.0.0') + + @tests.skip_unless(greendns_requirement) + def test_isv6(self): + assert greendns.is_ipv6_addr('dead:beef::1') + + @tests.skip_unless(greendns_requirement) + def test_isv6_invalid(self): + assert not greendns.is_ipv6_addr('foobar::1') + + @tests.skip_unless(greendns_requirement) + def test_v4(self): + assert greendns.is_ip_addr('1.2.3.4') + + @tests.skip_unless(greendns_requirement) + def test_v4_illegal(self): + assert not greendns.is_ip_addr('300.0.0.1') + + @tests.skip_unless(greendns_requirement) + def test_v6_addr(self): + assert greendns.is_ip_addr('::1') + + @tests.skip_unless(greendns_requirement) + def test_isv4_none(self): + assert not greendns.is_ipv4_addr(None) + + @tests.skip_unless(greendns_requirement) + def test_isv6_none(self): + assert not greendns.is_ipv6_addr(None) + + @tests.skip_unless(greendns_requirement) + def test_none(self): + assert not greendns.is_ip_addr(None) + + +class TestGethostbyname(tests.LimitedTestCase): + + def setUp(self): + self._old_resolve = greendns.resolve + greendns.resolve = _make_mock_resolve() + + def tearDown(self): + greendns.resolve = self._old_resolve + + @tests.skip_unless(greendns_requirement) + def test_ipaddr(self): + assert greendns.gethostbyname('1.2.3.4') == '1.2.3.4' + + @tests.skip_unless(greendns_requirement) + def test_name(self): + greendns.resolve.add('host.example.com', '1.2.3.4') + assert greendns.gethostbyname('host.example.com') == '1.2.3.4' + + +class TestGetaliases(tests.LimitedTestCase): + + def _make_mock_resolver(self): + base_resolver = _make_mock_base_resolver() + resolver = base_resolver() + resolver.aliases = ['cname.example.com'] + return resolver + + def setUp(self): + self._old_resolver = greendns.resolver + greendns.resolver = self._make_mock_resolver() + + def tearDown(self): + greendns.resolver = self._old_resolver + + @tests.skip_unless(greendns_requirement) + def test_getaliases(self): + assert greendns.getaliases('host.example.com') == ['cname.example.com'] + + +class TestGethostbyname_ex(tests.LimitedTestCase): + + def _make_mock_getaliases(self): + + class GetAliases(object): + aliases = ['cname.example.com'] + + def __call__(self, *args, **kwargs): + return self.aliases + + getaliases = GetAliases() + return getaliases + + def setUp(self): + self._old_resolve = greendns.resolve + greendns.resolve = _make_mock_resolve() + self._old_getaliases = greendns.getaliases + + def tearDown(self): + greendns.resolve = self._old_resolve + greendns.getaliases = self._old_getaliases + + @tests.skip_unless(greendns_requirement) + def test_ipaddr(self): + res = greendns.gethostbyname_ex('1.2.3.4') + assert res == ('1.2.3.4', [], ['1.2.3.4']) + + @tests.skip_unless(greendns_requirement) + def test_name(self): + greendns.resolve.add('host.example.com', '1.2.3.4') + greendns.getaliases = self._make_mock_getaliases() + greendns.getaliases.aliases = [] + res = greendns.gethostbyname_ex('host.example.com') + assert res == ('host.example.com', [], ['1.2.3.4']) + + @tests.skip_unless(greendns_requirement) + def test_multiple_addrs(self): + greendns.resolve.add('host.example.com', '1.2.3.4') + greendns.resolve.add('host.example.com', '1.2.3.5') + greendns.getaliases = self._make_mock_getaliases() + greendns.getaliases.aliases = [] + res = greendns.gethostbyname_ex('host.example.com') + assert res == ('host.example.com', [], ['1.2.3.4', '1.2.3.5']) + + +def test_reverse_name(): + tests.run_isolated('greendns_from_address_203.py') diff --git a/eventlet/tests/greenio_test.py b/python-eventlet/tests/greenio_test.py similarity index 94% rename from eventlet/tests/greenio_test.py rename to python-eventlet/tests/greenio_test.py index 4b375ba..8a94b7b 100644 --- a/eventlet/tests/greenio_test.py +++ b/python-eventlet/tests/greenio_test.py @@ -15,10 +15,7 @@ from eventlet import event, greenio, debug from eventlet.hubs import get_hub from eventlet.green import select, socket, time, ssl from eventlet.support import capture_stderr, get_errno, six -from tests import ( - LimitedTestCase, main, - skip_with_pyevent, skipped, skip_if, skip_on_windows, -) +import tests if six.PY3: @@ -58,7 +55,7 @@ def using_kqueue_hub(_f): return False -class TestGreenSocket(LimitedTestCase): +class TestGreenSocket(tests.LimitedTestCase): def assertWriteToClosedFileRaises(self, fd): if sys.version_info[0] < 3: # 2.x socket._fileobjects are odd: writes don't check @@ -481,7 +478,7 @@ class TestGreenSocket(LimitedTestCase): server.close() client.close() - @skip_with_pyevent + @tests.skip_with_pyevent def test_raised_multiple_readers(self): debug.hub_prevent_multiple_readers(True) @@ -503,9 +500,9 @@ class TestGreenSocket(LimitedTestCase): s.sendall(b'b') a.wait() - @skip_with_pyevent - @skip_if(using_epoll_hub) - @skip_if(using_kqueue_hub) + @tests.skip_with_pyevent + @tests.skip_if(using_epoll_hub) + @tests.skip_if(using_kqueue_hub) def test_closure(self): def spam_to_me(address): sock = eventlet.connect(address) @@ -612,6 +609,12 @@ class TestGreenSocket(LimitedTestCase): assert select.select([], [s1], [], 0) == ([], [s1], []) assert select.select([], [s1], [], 0) == ([], [s1], []) + def test_shutdown_safe(self): + sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + sock.close() + # should not raise + greenio.shutdown_safe(sock) + def test_get_fileno_of_a_socket_works(): class DummySocket(object): @@ -624,11 +627,15 @@ def test_get_fileno_of_an_int_works(): assert select.get_fileno(123) == 123 +expected_get_fileno_type_error_message = ( + 'Expected int or long, got <%s \'str\'>' % ('type' if six.PY2 else 'class')) + + def test_get_fileno_of_wrong_type_fails(): try: select.get_fileno('foo') except TypeError as ex: - assert str(ex) == 'Expected int or long, got ' + assert str(ex) == expected_get_fileno_type_error_message else: assert False, 'Expected TypeError not raised' @@ -640,13 +647,13 @@ def test_get_fileno_of_a_socket_with_fileno_returning_wrong_type_fails(): try: select.get_fileno(DummySocket()) except TypeError as ex: - assert str(ex) == 'Expected int or long, got ' + assert str(ex) == expected_get_fileno_type_error_message else: assert False, 'Expected TypeError not raised' -class TestGreenPipe(LimitedTestCase): - @skip_on_windows +class TestGreenPipe(tests.LimitedTestCase): + @tests.skip_on_windows def setUp(self): super(self.__class__, self).setUp() self.tempdir = tempfile.mkdtemp('_green_pipe_test') @@ -657,8 +664,8 @@ class TestGreenPipe(LimitedTestCase): def test_pipe(self): r, w = os.pipe() - rf = greenio.GreenPipe(r, 'r') - wf = greenio.GreenPipe(w, 'w', 0) + rf = greenio.GreenPipe(r, 'rb') + wf = greenio.GreenPipe(w, 'wb', 0) def sender(f, content): for ch in map(six.int2byte, six.iterbytes(content)): @@ -680,8 +687,8 @@ class TestGreenPipe(LimitedTestCase): # also ensures that readline() terminates on '\n' and '\r\n' r, w = os.pipe() - r = greenio.GreenPipe(r) - w = greenio.GreenPipe(w, 'w') + r = greenio.GreenPipe(r, 'rb') + w = greenio.GreenPipe(w, 'wb') def writer(): eventlet.sleep(.1) @@ -707,8 +714,8 @@ class TestGreenPipe(LimitedTestCase): def test_pipe_writes_large_messages(self): r, w = os.pipe() - r = greenio.GreenPipe(r) - w = greenio.GreenPipe(w, 'w') + r = greenio.GreenPipe(r, 'rb') + w = greenio.GreenPipe(w, 'wb') large_message = b"".join([1024 * six.int2byte(i) for i in range(65)]) @@ -720,7 +727,7 @@ class TestGreenPipe(LimitedTestCase): for i in range(65): buf = r.read(1024) - expected = 1024 * chr(i) + expected = 1024 * six.int2byte(i) self.assertEqual( buf, expected, "expected=%r..%r, found=%r..%r iter=%d" @@ -728,7 +735,7 @@ class TestGreenPipe(LimitedTestCase): gt.wait() def test_seek_on_buffered_pipe(self): - f = greenio.GreenPipe(self.tempdir + "/TestFile", 'w+', 1024) + f = greenio.GreenPipe(self.tempdir + "/TestFile", 'wb+', 1024) self.assertEqual(f.tell(), 0) f.seek(0, 2) self.assertEqual(f.tell(), 0) @@ -737,31 +744,31 @@ class TestGreenPipe(LimitedTestCase): self.assertEqual(f.tell(), 10) f.seek(0) value = f.read(1) - self.assertEqual(value, '1') + self.assertEqual(value, b'1') self.assertEqual(f.tell(), 1) value = f.read(1) - self.assertEqual(value, '2') + self.assertEqual(value, b'2') self.assertEqual(f.tell(), 2) f.seek(0, 1) - self.assertEqual(f.readline(), '34567890') + self.assertEqual(f.readline(), b'34567890') f.seek(-5, 1) - self.assertEqual(f.readline(), '67890') + self.assertEqual(f.readline(), b'67890') f.seek(0) - self.assertEqual(f.readline(), '1234567890') + self.assertEqual(f.readline(), b'1234567890') f.seek(0, 2) - self.assertEqual(f.readline(), '') + self.assertEqual(f.readline(), b'') def test_truncate(self): - f = greenio.GreenPipe(self.tempdir + "/TestFile", 'w+', 1024) + f = greenio.GreenPipe(self.tempdir + "/TestFile", 'wb+', 1024) f.write(b'1234567890') f.truncate(9) self.assertEqual(f.tell(), 9) -class TestGreenIoLong(LimitedTestCase): +class TestGreenIoLong(tests.LimitedTestCase): TEST_TIMEOUT = 10 # the test here might take a while depending on the OS - @skip_with_pyevent + @tests.skip_with_pyevent def test_multiple_readers(self, clibufsize=False): debug.hub_prevent_multiple_readers(False) recvsize = 2 * min_buf_size() @@ -814,21 +821,21 @@ class TestGreenIoLong(LimitedTestCase): assert len(results2) > 0 debug.hub_prevent_multiple_readers() - @skipped # by rdw because it fails but it's not clear how to make it pass - @skip_with_pyevent + @tests.skipped # by rdw because it fails but it's not clear how to make it pass + @tests.skip_with_pyevent def test_multiple_readers2(self): self.test_multiple_readers(clibufsize=True) -class TestGreenIoStarvation(LimitedTestCase): +class TestGreenIoStarvation(tests.LimitedTestCase): # fixme: this doesn't succeed, because of eventlet's predetermined # ordering. two processes, one with server, one with client eventlets # might be more reliable? TEST_TIMEOUT = 300 # the test here might take a while depending on the OS - @skipped # by rdw, because it fails but it's not clear how to make it pass - @skip_with_pyevent + @tests.skipped # by rdw, because it fails but it's not clear how to make it pass + @tests.skip_with_pyevent def test_server_starvation(self, sendloops=15): recvsize = 2 * min_buf_size() sendsize = 10000 * recvsize @@ -945,5 +952,5 @@ def test_socket_del_fails_gracefully_when_not_fully_initialized(): assert err.getvalue() == '' -if __name__ == '__main__': - main() +def test_double_close_219(): + tests.run_isolated('greenio_double_close_219.py') diff --git a/eventlet/tests/greenpipe_test_with_statement.py b/python-eventlet/tests/greenpipe_test_with_statement.py similarity index 100% rename from eventlet/tests/greenpipe_test_with_statement.py rename to python-eventlet/tests/greenpipe_test_with_statement.py diff --git a/eventlet/tests/greenpool_test.py b/python-eventlet/tests/greenpool_test.py similarity index 99% rename from eventlet/tests/greenpool_test.py rename to python-eventlet/tests/greenpool_test.py index 069ed5a..ff56262 100644 --- a/eventlet/tests/greenpool_test.py +++ b/python-eventlet/tests/greenpool_test.py @@ -202,7 +202,7 @@ class GreenPool(tests.LimitedTestCase): timer = eventlet.Timeout(0, RuntimeError()) try: tp.get() - self.fail("Shouldn't have recieved anything from the pool") + self.fail("Shouldn't have received anything from the pool") except RuntimeError: return 'timed out' else: diff --git a/eventlet/tests/greenthread_test.py b/python-eventlet/tests/greenthread_test.py similarity index 100% rename from eventlet/tests/greenthread_test.py rename to python-eventlet/tests/greenthread_test.py diff --git a/eventlet/tests/hub_test.py b/python-eventlet/tests/hub_test.py similarity index 98% rename from eventlet/tests/hub_test.py rename to python-eventlet/tests/hub_test.py index f1012a9..07e502a 100644 --- a/eventlet/tests/hub_test.py +++ b/python-eventlet/tests/hub_test.py @@ -298,7 +298,7 @@ class TestFork(LimitedTestCase): def test_fork(self): output = tests.run_python('tests/hub_test_fork.py') lines = output.splitlines() - self.assertEqual(lines, ["accept blocked", "child died ok"], output) + self.assertEqual(lines, [b"accept blocked", b"child died ok"], output) class TestDeadRunLoop(LimitedTestCase): @@ -330,7 +330,7 @@ class TestDeadRunLoop(LimitedTestCase): with eventlet.Timeout(0.5, self.CustomException()): # we now switch to the hub, there should be no existing timers # that switch back to this greenlet and so this hub.switch() - # call should block indefinately. + # call should block indefinitely. self.assertRaises(self.CustomException, hub.switch) def test_parent(self): @@ -352,7 +352,7 @@ class TestDeadRunLoop(LimitedTestCase): # we now switch to the hub which will allow # completion of dummyproc. # this should return execution back to the runloop and not - # this greenlet so that hub.switch() would block indefinately. + # this greenlet so that hub.switch() would block indefinitely. self.assertRaises(self.CustomException, hub.switch) assert g.dead # sanity check that dummyproc has completed @@ -376,8 +376,9 @@ try: except AttributeError: pass -import __builtin__ -original_import = __builtin__.__import__ +from eventlet.support.six.moves import builtins + +original_import = builtins.__import__ def fail_import(name, *args, **kwargs): if 'epoll' in name: @@ -386,7 +387,7 @@ def fail_import(name, *args, **kwargs): print('kqueue tried') return original_import(name, *args, **kwargs) -__builtin__.__import__ = fail_import +builtins.__import__ = fail_import import eventlet.hubs diff --git a/eventlet/tests/hub_test_fork.py b/python-eventlet/tests/hub_test_fork.py similarity index 100% rename from eventlet/tests/hub_test_fork.py rename to python-eventlet/tests/hub_test_fork.py diff --git a/eventlet/tests/manual/__init__.py b/python-eventlet/tests/isolated/__init__.py similarity index 100% rename from eventlet/tests/manual/__init__.py rename to python-eventlet/tests/isolated/__init__.py diff --git a/python-eventlet/tests/isolated/greendns_from_address_203.py b/python-eventlet/tests/isolated/greendns_from_address_203.py new file mode 100644 index 0000000..5c8bb14 --- /dev/null +++ b/python-eventlet/tests/isolated/greendns_from_address_203.py @@ -0,0 +1,16 @@ +__test__ = False + + +def main(): + import eventlet + try: + from dns import reversename + except ImportError: + print('skip:require dns (package dnspython)') + return + eventlet.monkey_patch(all=True) + reversename.from_address('127.0.0.1') + print('pass') + +if __name__ == '__main__': + main() diff --git a/python-eventlet/tests/isolated/greenio_double_close_219.py b/python-eventlet/tests/isolated/greenio_double_close_219.py new file mode 100644 index 0000000..9881ce8 --- /dev/null +++ b/python-eventlet/tests/isolated/greenio_double_close_219.py @@ -0,0 +1,22 @@ +__test__ = False + + +def main(): + import eventlet + eventlet.monkey_patch() + import subprocess + import gc + + p = subprocess.Popen(['ls'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + # the following line creates a _SocketDuckForFd(3) and .close()s it, but the + # object has not been collected by the GC yet + p.communicate() + + f = open('/dev/null', 'rb') # f.fileno() == 3 + gc.collect() # this calls the __del__ of _SocketDuckForFd(3), close()ing it again + + f.close() # OSError, because the fd 3 has already been closed + print('pass') + +if __name__ == '__main__': + main() diff --git a/python-eventlet/tests/isolated/mysqldb_monkey_patch.py b/python-eventlet/tests/isolated/mysqldb_monkey_patch.py new file mode 100644 index 0000000..8522d06 --- /dev/null +++ b/python-eventlet/tests/isolated/mysqldb_monkey_patch.py @@ -0,0 +1,14 @@ +from __future__ import print_function + +# no standard tests in this file, ignore +__test__ = False + +if __name__ == '__main__': + import MySQLdb as m + from eventlet import patcher + from eventlet.green import MySQLdb as gm + patcher.monkey_patch(all=True, MySQLdb=True) + patched_set = set(patcher.already_patched) - set(['psycopg']) + assert patched_set == frozenset(['MySQLdb', 'os', 'select', 'socket', 'thread', 'time']) + assert m.connect == gm.connect + print('pass') diff --git a/eventlet/tests/patcher_test_importlib_lock.py b/python-eventlet/tests/isolated/patcher_importlib_lock.py similarity index 96% rename from eventlet/tests/patcher_test_importlib_lock.py rename to python-eventlet/tests/isolated/patcher_importlib_lock.py index 8f7cea7..b6e5a11 100644 --- a/eventlet/tests/patcher_test_importlib_lock.py +++ b/python-eventlet/tests/isolated/patcher_importlib_lock.py @@ -27,4 +27,4 @@ if __name__ == '__main__': do_import() thread.join() - print('ok') + print('pass') diff --git a/python-eventlet/tests/isolated/patcher_threading_condition.py b/python-eventlet/tests/isolated/patcher_threading_condition.py new file mode 100644 index 0000000..5bce0f2 --- /dev/null +++ b/python-eventlet/tests/isolated/patcher_threading_condition.py @@ -0,0 +1,23 @@ +# Issue #185: test threading.Condition with monkey-patching +import eventlet + +# no standard tests in this file, ignore +__test__ = False + + +if __name__ == '__main__': + eventlet.monkey_patch() + + import threading + + def func(c): + with c: + c.notify() + + c = threading.Condition() + with c: + t = threading.Thread(target=func, args=(c,)) + t.start() + c.wait() + + print('pass') diff --git a/python-eventlet/tests/isolated/patcher_threading_join.py b/python-eventlet/tests/isolated/patcher_threading_join.py new file mode 100644 index 0000000..4361f52 --- /dev/null +++ b/python-eventlet/tests/isolated/patcher_threading_join.py @@ -0,0 +1,23 @@ +# Issue #223: test threading.Thread.join with monkey-patching +import eventlet + +# no standard tests in this file, ignore +__test__ = False + + +if __name__ == '__main__': + eventlet.monkey_patch() + + import threading + import time + + sleeper = threading.Thread(target=time.sleep, args=(1,)) + start = time.time() + sleeper.start() + sleeper.join() + dt = time.time() - start + + if dt < 1.0: + raise Exception("test failed: dt=%s" % dt) + + print('pass') diff --git a/eventlet/tests/wsgi_test_conntimeout.py b/python-eventlet/tests/isolated/wsgi_connection_timeout.py similarity index 53% rename from eventlet/tests/wsgi_test_conntimeout.py rename to python-eventlet/tests/isolated/wsgi_connection_timeout.py index d925a04..6a8c623 100644 --- a/eventlet/tests/wsgi_test_conntimeout.py +++ b/python-eventlet/tests/isolated/wsgi_connection_timeout.py @@ -22,13 +22,10 @@ server / client accept() conn - ExplodingConnectionWrap V V V connection makefile() file objects - ExplodingSocketFile <-- these raise """ -from __future__ import print_function - -import eventlet - import socket -import sys +import eventlet +from eventlet.support import six import tests.wsgi_test @@ -36,6 +33,17 @@ import tests.wsgi_test __test__ = False +TAG_BOOM = "=== ~* BOOM *~ ===" + +output_buffer = [] + + +class BufferLog(object): + @staticmethod + def write(s): + output_buffer.append(s.rstrip()) + + # This test might make you wince class NaughtySocketAcceptWrap(object): # server's socket.accept(); patches resulting connection sockets @@ -53,12 +61,12 @@ class NaughtySocketAcceptWrap(object): conn_wrap.unwrap() def arm(self): - print("ca-click") + output_buffer.append("ca-click") for i in self.conn_reg: i.arm() def __call__(self): - print(self.__class__.__name__ + ".__call__") + output_buffer.append(self.__class__.__name__ + ".__call__") conn, addr = self.sock._really_accept() self.conn_reg.append(ExplodingConnectionWrap(conn)) return conn, addr @@ -81,12 +89,12 @@ class ExplodingConnectionWrap(object): del self.conn._really_makefile def arm(self): - print("tick") + output_buffer.append("tick") for i in self.file_reg: i.arm() def __call__(self, mode='r', bufsize=-1): - print(self.__class__.__name__ + ".__call__") + output_buffer.append(self.__class__.__name__ + ".__call__") # file_obj = self.conn._really_makefile(*args, **kwargs) file_obj = ExplodingSocketFile(self.conn._sock, mode, bufsize) self.file_reg.append(file_obj) @@ -96,69 +104,88 @@ class ExplodingConnectionWrap(object): class ExplodingSocketFile(eventlet.greenio._fileobject): def __init__(self, sock, mode='rb', bufsize=-1, close=False): - super(self.__class__, self).__init__(sock, mode, bufsize, close) + args = [bufsize, close] if six.PY2 else [] + super(self.__class__, self).__init__(sock, mode, *args) self.armed = False def arm(self): - print("beep") + output_buffer.append("beep") self.armed = True def _fuse(self): if self.armed: - print("=== ~* BOOM *~ ===") + output_buffer.append(TAG_BOOM) raise socket.timeout("timed out") def readline(self, *args, **kwargs): - print(self.__class__.__name__ + ".readline") + output_buffer.append(self.__class__.__name__ + ".readline") self._fuse() return super(self.__class__, self).readline(*args, **kwargs) -if __name__ == '__main__': - for debug in (False, True): - print("SEPERATOR_SENTINEL") - print("debug set to: %s" % debug) - - server_sock = eventlet.listen(('localhost', 0)) - server_addr = server_sock.getsockname() - sock_wrap = NaughtySocketAcceptWrap(server_sock) - - eventlet.spawn_n( - eventlet.wsgi.server, - debug=debug, - log=sys.stdout, - max_size=128, - site=tests.wsgi_test.Site(), - sock=server_sock, - ) - +def step(debug): + output_buffer[:] = [] + + server_sock = eventlet.listen(('localhost', 0)) + server_addr = server_sock.getsockname() + sock_wrap = NaughtySocketAcceptWrap(server_sock) + + eventlet.spawn_n( + eventlet.wsgi.server, + debug=debug, + log=BufferLog, + max_size=128, + site=tests.wsgi_test.Site(), + sock=server_sock, + ) + + try: + # req #1 - normal + sock1 = eventlet.connect(server_addr) + sock1.settimeout(0.1) + fd1 = sock1.makefile('rwb') + fd1.write(b'GET / HTTP/1.1\r\nHost: localhost\r\n\r\n') + fd1.flush() + tests.wsgi_test.read_http(sock1) + + # let the server socket ops catch up, set bomb + eventlet.sleep(0) + output_buffer.append("arming...") + sock_wrap.arm() + + # req #2 - old conn, post-arm - timeout + fd1.write(b'GET / HTTP/1.1\r\nHost: localhost\r\n\r\n') + fd1.flush() try: - # req #1 - normal - sock1 = eventlet.connect(server_addr) - sock1.settimeout(0.1) - fd1 = sock1.makefile('rwb') - fd1.write(b'GET / HTTP/1.1\r\nHost: localhost\r\n\r\n') - fd1.flush() tests.wsgi_test.read_http(sock1) + assert False, 'Expected ConnectionClosed exception' + except tests.wsgi_test.ConnectionClosed: + pass + + fd1.close() + sock1.close() + finally: + # reset streams, then output trapped tracebacks + sock_wrap.unwrap() + # check output asserts in tests.wsgi_test.TestHttpd + # test_143_server_connection_timeout_exception + + return output_buffer[:] + + +def main(): + output_normal = step(debug=False) + output_debug = step(debug=True) + + assert "timed out" in output_debug[-1], repr(output_debug) + # if the BOOM check fails, it's because our timeout didn't happen + # (if eventlet stops using file.readline() to read HTTP headers, + # for instance) + assert TAG_BOOM == output_debug[-2], repr(output_debug) + assert TAG_BOOM == output_normal[-1], repr(output_normal) + assert "Traceback" not in output_debug, repr(output_debug) + assert "Traceback" not in output_normal, repr(output_normal) + print("pass") - # let the server socket ops catch up, set bomb - eventlet.sleep(0) - print("arming...") - sock_wrap.arm() - - # req #2 - old conn, post-arm - timeout - fd1.write(b'GET / HTTP/1.1\r\nHost: localhost\r\n\r\n') - fd1.flush() - try: - tests.wsgi_test.read_http(sock1) - assert False, 'Expected ConnectionClosed exception' - except tests.wsgi_test.ConnectionClosed: - pass - - fd1.close() - sock1.close() - finally: - # reset streams, then output trapped tracebacks - sock_wrap.unwrap() - # check output asserts in tests.wsgi_test.TestHttpd - # test_143_server_connection_timeout_exception +if __name__ == '__main__': + main() diff --git a/python-eventlet/tests/manual/__init__.py b/python-eventlet/tests/manual/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/eventlet/tests/manual/greenio_memtest.py b/python-eventlet/tests/manual/greenio_memtest.py similarity index 100% rename from eventlet/tests/manual/greenio_memtest.py rename to python-eventlet/tests/manual/greenio_memtest.py diff --git a/python-eventlet/tests/manual/regress-226-unpatched-ssl.py b/python-eventlet/tests/manual/regress-226-unpatched-ssl.py new file mode 100644 index 0000000..2d0d49c --- /dev/null +++ b/python-eventlet/tests/manual/regress-226-unpatched-ssl.py @@ -0,0 +1,3 @@ +import eventlet +import requests +requests.get('https://www.google.com/').status_code diff --git a/eventlet/tests/mock.py b/python-eventlet/tests/mock.py similarity index 99% rename from eventlet/tests/mock.py rename to python-eventlet/tests/mock.py index 7bb567a..3430021 100644 --- a/eventlet/tests/mock.py +++ b/python-eventlet/tests/mock.py @@ -1172,7 +1172,7 @@ class _patch(object): @wraps(func) def patched(*args, **keywargs): - # don't use a with here (backwards compatability with Python 2.4) + # don't use a with here (backwards compatibility with Python 2.4) extra_args = [] entered_patchers = [] diff --git a/eventlet/tests/mysqldb_test.py b/python-eventlet/tests/mysqldb_test.py similarity index 91% rename from eventlet/tests/mysqldb_test.py rename to python-eventlet/tests/mysqldb_test.py index e5a87d3..578de4e 100644 --- a/eventlet/tests/mysqldb_test.py +++ b/python-eventlet/tests/mysqldb_test.py @@ -6,15 +6,12 @@ import traceback import eventlet from eventlet import event -from tests import ( - LimitedTestCase, - run_python, - skip_unless, using_pyevent, get_database_auth, -) try: from eventlet.green import MySQLdb except ImportError: MySQLdb = False +import tests +from tests import skip_unless, using_pyevent, get_database_auth def mysql_requirement(_f): @@ -40,7 +37,7 @@ def mysql_requirement(_f): return False -class TestMySQLdb(LimitedTestCase): +class TestMySQLdb(tests.LimitedTestCase): def setUp(self): self._auth = get_database_auth()['MySQLdb'] self.create_db() @@ -229,16 +226,7 @@ class TestMySQLdb(LimitedTestCase): conn.commit() -class TestMonkeyPatch(LimitedTestCase): +class TestMonkeyPatch(tests.LimitedTestCase): @skip_unless(mysql_requirement) def test_monkey_patching(self): - testcode_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - 'mysqldb_test_monkey_patch.py', - ) - output = run_python(testcode_path) - lines = output.splitlines() - self.assertEqual(len(lines), 2, output) - self.assertEqual(lines[0].replace("psycopg,", ""), - 'mysqltest MySQLdb,os,select,socket,thread,time') - self.assertEqual(lines[1], "connect True") + tests.run_isolated('mysqldb_monkey_patch.py') diff --git a/eventlet/tests/nosewrapper.py b/python-eventlet/tests/nosewrapper.py similarity index 100% rename from eventlet/tests/nosewrapper.py rename to python-eventlet/tests/nosewrapper.py diff --git a/eventlet/tests/parse_results.py b/python-eventlet/tests/parse_results.py similarity index 100% rename from eventlet/tests/parse_results.py rename to python-eventlet/tests/parse_results.py diff --git a/eventlet/tests/patcher_psycopg_test.py b/python-eventlet/tests/patcher_psycopg_test.py similarity index 100% rename from eventlet/tests/patcher_psycopg_test.py rename to python-eventlet/tests/patcher_psycopg_test.py diff --git a/eventlet/tests/patcher_test.py b/python-eventlet/tests/patcher_test.py similarity index 96% rename from eventlet/tests/patcher_test.py rename to python-eventlet/tests/patcher_test.py index 5c9076f..2e458c5 100644 --- a/eventlet/tests/patcher_test.py +++ b/python-eventlet/tests/patcher_test.py @@ -4,15 +4,12 @@ import sys import tempfile from eventlet.support import six -from tests import LimitedTestCase, main, run_python, skip_with_pyevent +import tests base_module_contents = """ import socket -try: - import urllib.request as urllib -except ImportError: - import urllib +import urllib print("base {0} {1}".format(socket, urllib)) """ @@ -32,7 +29,7 @@ print("importing {0} {1} {2} {3}".format(patching, socket, patching.socket, patc """ -class ProcessBase(LimitedTestCase): +class ProcessBase(tests.LimitedTestCase): TEST_TIMEOUT = 3 # starting processes is time-consuming def setUp(self): @@ -54,7 +51,7 @@ class ProcessBase(LimitedTestCase): def launch_subprocess(self, filename): path = os.path.join(self.tempdir, filename) - output = run_python(path) + output = tests.run_python(path) if six.PY3: output = output.decode('utf-8') separator = '\n' @@ -86,7 +83,14 @@ class ImportPatched(ProcessBase): assert 'eventlet.green.httplib' not in lines[2], repr(output) def test_import_patched_defaults(self): - self.write_to_tempfile("base", base_module_contents) + self.write_to_tempfile("base", """ +import socket +try: + import urllib.request as urllib +except ImportError: + import urllib +print("base {0} {1}".format(socket, urllib))""") + new_mod = """ from eventlet import patcher base = patcher.import_patched('base') @@ -242,7 +246,7 @@ def test_monkey_patch_threading(): class Tpool(ProcessBase): TEST_TIMEOUT = 3 - @skip_with_pyevent + @tests.skip_with_pyevent def test_simple(self): new_mod = """ import eventlet @@ -260,7 +264,7 @@ tpool.killall() assert '2' in lines[0], repr(output) assert '3' in lines[1], repr(output) - @skip_with_pyevent + @tests.skip_with_pyevent def test_unpatched_thread(self): new_mod = """import eventlet eventlet.monkey_patch(time=False, thread=False) @@ -273,7 +277,7 @@ import time output, lines = self.launch_subprocess('newmod.py') self.assertEqual(len(lines), 2, lines) - @skip_with_pyevent + @tests.skip_with_pyevent def test_patched_thread(self): new_mod = """import eventlet eventlet.monkey_patch(time=False, thread=True) @@ -493,9 +497,12 @@ t2.join() def test_importlib_lock(): - output = run_python('tests/patcher_test_importlib_lock.py') - assert output.rstrip() == b'ok' + tests.run_isolated('patcher_importlib_lock.py') + + +def test_threading_condition(): + tests.run_isolated('patcher_threading_condition.py') -if __name__ == '__main__': - main() +def test_threading_join(): + tests.run_isolated('patcher_threading_join.py') diff --git a/eventlet/tests/pools_test.py b/python-eventlet/tests/pools_test.py similarity index 100% rename from eventlet/tests/pools_test.py rename to python-eventlet/tests/pools_test.py diff --git a/eventlet/tests/queue_test.py b/python-eventlet/tests/queue_test.py similarity index 100% rename from eventlet/tests/queue_test.py rename to python-eventlet/tests/queue_test.py diff --git a/eventlet/tests/semaphore_test.py b/python-eventlet/tests/semaphore_test.py similarity index 74% rename from eventlet/tests/semaphore_test.py rename to python-eventlet/tests/semaphore_test.py index 1316330..ced9136 100644 --- a/eventlet/tests/semaphore_test.py +++ b/python-eventlet/tests/semaphore_test.py @@ -45,5 +45,24 @@ class TestSemaphore(LimitedTestCase): self.assertRaises(ValueError, sem.acquire, blocking=False, timeout=1) +def test_semaphore_contention(): + g_mutex = semaphore.Semaphore() + counts = [0, 0] + + def worker(no): + while min(counts) < 200: + with g_mutex: + counts[no - 1] += 1 + eventlet.sleep(0.001) + + t1 = eventlet.spawn(worker, no=1) + t2 = eventlet.spawn(worker, no=2) + eventlet.sleep(0.5) + t1.kill() + t2.kill() + + assert abs(counts[0] - counts[1]) < int(min(counts) * 0.1), counts + + if __name__ == '__main__': - unittest.main() + unittest.main() \ No newline at end of file diff --git a/eventlet/tests/socket_test.py b/python-eventlet/tests/socket_test.py similarity index 100% rename from eventlet/tests/socket_test.py rename to python-eventlet/tests/socket_test.py diff --git a/eventlet/tests/ssl_test.py b/python-eventlet/tests/ssl_test.py similarity index 100% rename from eventlet/tests/ssl_test.py rename to python-eventlet/tests/ssl_test.py diff --git a/eventlet/tests/stdlib/all.py b/python-eventlet/tests/stdlib/all.py similarity index 100% rename from eventlet/tests/stdlib/all.py rename to python-eventlet/tests/stdlib/all.py diff --git a/eventlet/tests/stdlib/all_modules.py b/python-eventlet/tests/stdlib/all_modules.py similarity index 100% rename from eventlet/tests/stdlib/all_modules.py rename to python-eventlet/tests/stdlib/all_modules.py diff --git a/eventlet/tests/stdlib/all_monkey.py b/python-eventlet/tests/stdlib/all_monkey.py similarity index 100% rename from eventlet/tests/stdlib/all_monkey.py rename to python-eventlet/tests/stdlib/all_monkey.py diff --git a/eventlet/tests/stdlib/test_SimpleHTTPServer.py b/python-eventlet/tests/stdlib/test_SimpleHTTPServer.py similarity index 100% rename from eventlet/tests/stdlib/test_SimpleHTTPServer.py rename to python-eventlet/tests/stdlib/test_SimpleHTTPServer.py diff --git a/eventlet/tests/stdlib/test_asynchat.py b/python-eventlet/tests/stdlib/test_asynchat.py similarity index 100% rename from eventlet/tests/stdlib/test_asynchat.py rename to python-eventlet/tests/stdlib/test_asynchat.py diff --git a/eventlet/tests/stdlib/test_asyncore.py b/python-eventlet/tests/stdlib/test_asyncore.py similarity index 100% rename from eventlet/tests/stdlib/test_asyncore.py rename to python-eventlet/tests/stdlib/test_asyncore.py diff --git a/eventlet/tests/stdlib/test_ftplib.py b/python-eventlet/tests/stdlib/test_ftplib.py similarity index 100% rename from eventlet/tests/stdlib/test_ftplib.py rename to python-eventlet/tests/stdlib/test_ftplib.py diff --git a/eventlet/tests/stdlib/test_httplib.py b/python-eventlet/tests/stdlib/test_httplib.py similarity index 100% rename from eventlet/tests/stdlib/test_httplib.py rename to python-eventlet/tests/stdlib/test_httplib.py diff --git a/eventlet/tests/stdlib/test_httpservers.py b/python-eventlet/tests/stdlib/test_httpservers.py similarity index 100% rename from eventlet/tests/stdlib/test_httpservers.py rename to python-eventlet/tests/stdlib/test_httpservers.py diff --git a/eventlet/tests/stdlib/test_os.py b/python-eventlet/tests/stdlib/test_os.py similarity index 100% rename from eventlet/tests/stdlib/test_os.py rename to python-eventlet/tests/stdlib/test_os.py diff --git a/eventlet/tests/stdlib/test_queue.py b/python-eventlet/tests/stdlib/test_queue.py similarity index 100% rename from eventlet/tests/stdlib/test_queue.py rename to python-eventlet/tests/stdlib/test_queue.py diff --git a/eventlet/tests/stdlib/test_select.py b/python-eventlet/tests/stdlib/test_select.py similarity index 100% rename from eventlet/tests/stdlib/test_select.py rename to python-eventlet/tests/stdlib/test_select.py diff --git a/eventlet/tests/stdlib/test_socket.py b/python-eventlet/tests/stdlib/test_socket.py similarity index 100% rename from eventlet/tests/stdlib/test_socket.py rename to python-eventlet/tests/stdlib/test_socket.py diff --git a/eventlet/tests/stdlib/test_socket_ssl.py b/python-eventlet/tests/stdlib/test_socket_ssl.py similarity index 100% rename from eventlet/tests/stdlib/test_socket_ssl.py rename to python-eventlet/tests/stdlib/test_socket_ssl.py diff --git a/eventlet/tests/stdlib/test_socketserver.py b/python-eventlet/tests/stdlib/test_socketserver.py similarity index 100% rename from eventlet/tests/stdlib/test_socketserver.py rename to python-eventlet/tests/stdlib/test_socketserver.py diff --git a/eventlet/tests/stdlib/test_ssl.py b/python-eventlet/tests/stdlib/test_ssl.py similarity index 100% rename from eventlet/tests/stdlib/test_ssl.py rename to python-eventlet/tests/stdlib/test_ssl.py diff --git a/eventlet/tests/stdlib/test_subprocess.py b/python-eventlet/tests/stdlib/test_subprocess.py similarity index 100% rename from eventlet/tests/stdlib/test_subprocess.py rename to python-eventlet/tests/stdlib/test_subprocess.py diff --git a/eventlet/tests/stdlib/test_thread.py b/python-eventlet/tests/stdlib/test_thread.py similarity index 100% rename from eventlet/tests/stdlib/test_thread.py rename to python-eventlet/tests/stdlib/test_thread.py diff --git a/eventlet/tests/stdlib/test_thread__boundedsem.py b/python-eventlet/tests/stdlib/test_thread__boundedsem.py similarity index 100% rename from eventlet/tests/stdlib/test_thread__boundedsem.py rename to python-eventlet/tests/stdlib/test_thread__boundedsem.py diff --git a/eventlet/tests/stdlib/test_threading.py b/python-eventlet/tests/stdlib/test_threading.py similarity index 100% rename from eventlet/tests/stdlib/test_threading.py rename to python-eventlet/tests/stdlib/test_threading.py diff --git a/eventlet/tests/stdlib/test_threading_local.py b/python-eventlet/tests/stdlib/test_threading_local.py similarity index 100% rename from eventlet/tests/stdlib/test_threading_local.py rename to python-eventlet/tests/stdlib/test_threading_local.py diff --git a/eventlet/tests/stdlib/test_timeout.py b/python-eventlet/tests/stdlib/test_timeout.py similarity index 100% rename from eventlet/tests/stdlib/test_timeout.py rename to python-eventlet/tests/stdlib/test_timeout.py diff --git a/eventlet/tests/stdlib/test_urllib.py b/python-eventlet/tests/stdlib/test_urllib.py similarity index 100% rename from eventlet/tests/stdlib/test_urllib.py rename to python-eventlet/tests/stdlib/test_urllib.py diff --git a/eventlet/tests/stdlib/test_urllib2.py b/python-eventlet/tests/stdlib/test_urllib2.py similarity index 100% rename from eventlet/tests/stdlib/test_urllib2.py rename to python-eventlet/tests/stdlib/test_urllib2.py diff --git a/eventlet/tests/stdlib/test_urllib2_localnet.py b/python-eventlet/tests/stdlib/test_urllib2_localnet.py similarity index 100% rename from eventlet/tests/stdlib/test_urllib2_localnet.py rename to python-eventlet/tests/stdlib/test_urllib2_localnet.py diff --git a/eventlet/tests/subprocess_test.py b/python-eventlet/tests/subprocess_test.py similarity index 72% rename from eventlet/tests/subprocess_test.py rename to python-eventlet/tests/subprocess_test.py index 6964a74..085f656 100644 --- a/eventlet/tests/subprocess_test.py +++ b/python-eventlet/tests/subprocess_test.py @@ -1,7 +1,6 @@ import eventlet from eventlet.green import subprocess import eventlet.patcher -from nose.plugins.skip import SkipTest import sys import time original_subprocess = eventlet.patcher.original('subprocess') @@ -19,7 +18,7 @@ def test_subprocess_wait(): try: p.wait(timeout=0.1) except subprocess.TimeoutExpired as e: - str(e) # make sure it doesnt throw + str(e) # make sure it doesn't throw assert e.cmd == cmd assert e.timeout == 0.1 ok = True @@ -29,14 +28,15 @@ def test_subprocess_wait(): def test_communicate_with_poll(): + # This test was being skipped since git 25812fca8, I don't there's + # a need to do this. The original comment: + # # https://github.com/eventlet/eventlet/pull/24 # `eventlet.green.subprocess.Popen.communicate()` was broken # in Python 2.7 because the usage of the `select` module was moved from # `_communicate` into two other methods `_communicate_with_select` # and `_communicate_with_poll`. Link to 2.7's implementation: # http://hg.python.org/cpython/file/2145593d108d/Lib/subprocess.py#l1255 - if getattr(original_subprocess.Popen, '_communicate_with_poll', None) is None: - raise SkipTest('original subprocess.Popen does not have _communicate_with_poll') p = subprocess.Popen( [sys.executable, '-c', 'import time; time.sleep(0.5)'], @@ -45,3 +45,22 @@ def test_communicate_with_poll(): eventlet.with_timeout(0.1, p.communicate, timeout_value=True) tdiff = time.time() - t1 assert 0.1 <= tdiff <= 0.2, 'did not stop within allowed time' + + +def test_close_popen_stdin_with_close_fds(): + p = subprocess.Popen( + ['ls'], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + close_fds=True, + shell=False, + cwd=None, + env=None) + + p.communicate(None) + + try: + p.stdin.close() + except Exception as e: + assert False, "Exception should not be raised, got %r instead" % e diff --git a/eventlet/tests/test__event.py b/python-eventlet/tests/test__event.py similarity index 100% rename from eventlet/tests/test__event.py rename to python-eventlet/tests/test__event.py diff --git a/eventlet/tests/test__greenness.py b/python-eventlet/tests/test__greenness.py similarity index 79% rename from eventlet/tests/test__greenness.py rename to python-eventlet/tests/test__greenness.py index 7d90890..a594b4d 100644 --- a/eventlet/tests/test__greenness.py +++ b/python-eventlet/tests/test__greenness.py @@ -4,8 +4,15 @@ If either operation blocked the whole script would block and timeout. """ import unittest -from eventlet.green import urllib2, BaseHTTPServer +from eventlet.green import BaseHTTPServer from eventlet import spawn, kill +from eventlet.support import six + +if six.PY2: + from eventlet.green.urllib2 import HTTPError, urlopen +else: + from eventlet.green.urllib.request import urlopen + from eventlet.green.urllib.error import HTTPError class QuietHandler(BaseHTTPServer.BaseHTTPRequestHandler): @@ -40,12 +47,12 @@ class TestGreenness(unittest.TestCase): self.server.server_close() kill(self.gthread) - def test_urllib2(self): + def test_urllib(self): self.assertEqual(self.server.request_count, 0) try: - urllib2.urlopen('http://127.0.0.1:%s' % self.port) + urlopen('http://127.0.0.1:%s' % self.port) assert False, 'should not get there' - except urllib2.HTTPError as ex: + except HTTPError as ex: assert ex.code == 501, repr(ex) self.assertEqual(self.server.request_count, 1) diff --git a/eventlet/tests/test__refcount.py b/python-eventlet/tests/test__refcount.py similarity index 100% rename from eventlet/tests/test__refcount.py rename to python-eventlet/tests/test__refcount.py diff --git a/eventlet/tests/test__socket_errors.py b/python-eventlet/tests/test__socket_errors.py similarity index 87% rename from eventlet/tests/test__socket_errors.py rename to python-eventlet/tests/test__socket_errors.py index 7832de0..21fab40 100644 --- a/eventlet/tests/test__socket_errors.py +++ b/python-eventlet/tests/test__socket_errors.py @@ -52,5 +52,15 @@ class TestSocketErrors(unittest.TestCase): cs.close() server.close() + +def test_create_connection_refused(): + errno = None + try: + socket.create_connection(('127.0.0.1', 0)) + except socket.error as ex: + errno = ex.errno + assert errno in [111, 61, 10061], 'Expected socket.error ECONNREFUSED, got {0}'.format(errno) + + if __name__ == '__main__': unittest.main() diff --git a/eventlet/tests/test_server.crt b/python-eventlet/tests/test_server.crt similarity index 100% rename from eventlet/tests/test_server.crt rename to python-eventlet/tests/test_server.crt diff --git a/eventlet/tests/test_server.key b/python-eventlet/tests/test_server.key similarity index 100% rename from eventlet/tests/test_server.key rename to python-eventlet/tests/test_server.key diff --git a/eventlet/tests/thread_test.py b/python-eventlet/tests/thread_test.py similarity index 100% rename from eventlet/tests/thread_test.py rename to python-eventlet/tests/thread_test.py diff --git a/eventlet/tests/timeout_test.py b/python-eventlet/tests/timeout_test.py similarity index 100% rename from eventlet/tests/timeout_test.py rename to python-eventlet/tests/timeout_test.py diff --git a/eventlet/tests/timeout_test_with_statement.py b/python-eventlet/tests/timeout_test_with_statement.py similarity index 100% rename from eventlet/tests/timeout_test_with_statement.py rename to python-eventlet/tests/timeout_test_with_statement.py diff --git a/eventlet/tests/timer_test.py b/python-eventlet/tests/timer_test.py similarity index 100% rename from eventlet/tests/timer_test.py rename to python-eventlet/tests/timer_test.py diff --git a/eventlet/tests/tpool_test.py b/python-eventlet/tests/tpool_test.py similarity index 96% rename from eventlet/tests/tpool_test.py rename to python-eventlet/tests/tpool_test.py index 5af1a40..818bb45 100644 --- a/eventlet/tests/tpool_test.py +++ b/python-eventlet/tests/tpool_test.py @@ -20,7 +20,7 @@ import re import time import eventlet -from eventlet import tpool +from eventlet import tpool, debug, event from eventlet.support import six from tests import LimitedTestCase, skipped, skip_with_pyevent, main @@ -228,6 +228,22 @@ class TestTpool(LimitedTestCase): tpool.killall() tpool.setup() + @skip_with_pyevent + def test_killall_remaining_results(self): + semaphore = event.Event() + + def native_fun(): + time.sleep(.5) + + def gt_fun(): + semaphore.send(None) + tpool.execute(native_fun) + + gt = eventlet.spawn(gt_fun) + semaphore.wait() + tpool.killall() + gt.wait() + @skip_with_pyevent def test_autowrap(self): x = tpool.Proxy({'a': 1, 'b': 2}, autowrap=(int,)) diff --git a/eventlet/tests/websocket_new_test.py b/python-eventlet/tests/websocket_new_test.py similarity index 97% rename from eventlet/tests/websocket_new_test.py rename to python-eventlet/tests/websocket_new_test.py index 95d36b5..381d51c 100644 --- a/eventlet/tests/websocket_new_test.py +++ b/python-eventlet/tests/websocket_new_test.py @@ -1,14 +1,11 @@ import errno import struct -from nose.tools import eq_ - import eventlet from eventlet import event from eventlet import websocket from eventlet.green import httplib from eventlet.green import socket -from eventlet import websocket from eventlet.support import six from tests.wsgi_test import _TestBase @@ -129,11 +126,11 @@ class TestWebSocket(_TestBase): sock.recv(1024) ws = websocket.RFC6455WebSocket(sock, {}, client=True) ws.send(b'hello') - eq_(ws.wait(), b'hello') + assert ws.wait() == b'hello' ws.send(b'hello world!\x01') ws.send(u'hello world again!') - eq_(ws.wait(), b'hello world!\x01') - eq_(ws.wait(), u'hello world again!') + assert ws.wait() == b'hello world!\x01' + assert ws.wait() == u'hello world again!' ws.close() eventlet.sleep(0.01) diff --git a/eventlet/tests/websocket_test.py b/python-eventlet/tests/websocket_test.py similarity index 100% rename from eventlet/tests/websocket_test.py rename to python-eventlet/tests/websocket_test.py diff --git a/eventlet/tests/wsgi_test.py b/python-eventlet/tests/wsgi_test.py similarity index 98% rename from eventlet/tests/wsgi_test.py rename to python-eventlet/tests/wsgi_test.py index 179881d..d5cea18 100644 --- a/eventlet/tests/wsgi_test.py +++ b/python-eventlet/tests/wsgi_test.py @@ -1330,11 +1330,24 @@ class TestHttpd(_TestBase): self.assertEqual(result.headers_lower['connection'], 'close') assert 'transfer-encoding' not in result.headers_lower - def test_unicode_raises_error(self): + def test_unicode_with_only_ascii_characters_works(self): def wsgi_app(environ, start_response): start_response("200 OK", []) - yield u"oh hai" - yield u"non-encodable unicode: \u0230" + yield b"oh hai, " + yield u"xxx" + self.site.application = wsgi_app + sock = eventlet.connect(('localhost', self.port)) + fd = sock.makefile('rwb') + fd.write(b'GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n') + fd.flush() + result = read_http(sock) + assert b'xxx' in result.body + + def test_unicode_with_nonascii_characters_raises_error(self): + def wsgi_app(environ, start_response): + start_response("200 OK", []) + yield b"oh hai, " + yield u"xxx \u0230" self.site.application = wsgi_app sock = eventlet.connect(('localhost', self.port)) fd = sock.makefile('rwb') @@ -1343,7 +1356,6 @@ class TestHttpd(_TestBase): result = read_http(sock) self.assertEqual(result.status, 'HTTP/1.1 500 Internal Server Error') self.assertEqual(result.headers_lower['connection'], 'close') - assert b'unicode' in result.body def test_path_info_decoding(self): def wsgi_app(environ, start_response): @@ -1443,22 +1455,7 @@ class TestHttpd(_TestBase): # Handle connection socket timeouts # https://bitbucket.org/eventlet/eventlet/issue/143/ # Runs tests.wsgi_test_conntimeout in a separate process. - testcode_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - 'wsgi_test_conntimeout.py') - output = tests.run_python(testcode_path) - sections = output.split(b"SEPERATOR_SENTINEL") - # first section is empty - self.assertEqual(3, len(sections), output) - # if the "BOOM" check fails, it's because our timeout didn't happen - # (if eventlet stops using file.readline() to read HTTP headers, - # for instance) - for runlog in sections[1:]: - debug = False if "debug set to: False" in runlog else True - if debug: - self.assertTrue("timed out" in runlog) - self.assertTrue("BOOM" in runlog) - self.assertFalse("Traceback" in runlog) + tests.run_isolated('wsgi_connection_timeout.py') def test_server_socket_timeout(self): self.spawn_server(socket_timeout=0.1) @@ -1743,7 +1740,16 @@ class TestChunkedInput(_TestBase): fd = self.connect() fd.sendall(req.encode()) fd.close() - eventlet.sleep(0.0) + + eventlet.sleep(0) + + # This is needed because on Python 3 GreenSocket.recv_into is called + # rather than recv; recv_into right now (git 5ec3a3c) trampolines to + # the hub *before* attempting to read anything from a file descriptor + # therefore we need one extra context switch to let it notice closed + # socket, die and leave the hub empty + if six.PY3: + eventlet.sleep(0) finally: signal.alarm(0) signal.signal(signal.SIGALRM, signal.SIG_DFL) diff --git a/eventlet/tests/zmq_test.py b/python-eventlet/tests/zmq_test.py similarity index 100% rename from eventlet/tests/zmq_test.py rename to python-eventlet/tests/zmq_test.py diff --git a/python-eventlet/tox.ini b/python-eventlet/tox.ini new file mode 100644 index 0000000..e4f4e76 --- /dev/null +++ b/python-eventlet/tox.ini @@ -0,0 +1,55 @@ +# The flake8 and pep8 sections just contain configuration for corresponding tools. +# Checkers are not run implicitly. +[flake8] +exclude = *.egg*,.env,.git,.hg,.tox,_*,build*,dist*,venv*,six.py,mock.py +ignore = E261 +max-line-length = 101 + +[pep8] +count = 1 +exclude = *.egg*,.env,.git,.hg,.tox,_*,build*,dist*,venv*,six.py,mock.py +ignore = E261 +max-line-length = 101 +show-source = 1 +statistics = 1 + +[tox] +minversion=1.8 +envlist = + pep8, py{26,27,33,34,py}-{selects,poll,epolls}, py{27,34,py}-dns + +[testenv:pep8] +basepython = python2.7 +setenv = + {[testenv]setenv} +deps = + pep8==1.5.6 +commands = + pep8 benchmarks/ eventlet/ tests/ + +[testenv] +downloadcache = {toxworkdir}/pip_download_cache +setenv = + PYTHONDONTWRITEBYTECODE = 1 + selects: EVENTLET_HUB = selects + poll: EVENTLET_HUB = poll + epolls: EVENTLET_HUB = epolls +basepython = + py26: python2.6 + py27: python2.7 + py33: python3.3 + py34: python3.4 + pypy: pypy +deps = + nose==1.3.1 + setuptools==5.4.1 + py27-dns: dnspython==1.12.0 + py{26,27}-{selects,poll,epolls}: MySQL-python==1.2.5 + py{34,py}-dns: dnspython3==1.12.0 + {selects,poll,epolls}: psycopg2cffi-compat==1.1 + {selects,poll,epolls}: pyopenssl==0.13 + {selects,poll,epolls}: pyzmq==13.1.0 +commands = + nosetests --verbose {posargs:tests/} + nosetests --verbose --with-doctest eventlet/coros.py eventlet/event.py \ + eventlet/pools.py eventlet/queue.py eventlet/timeout.py -- 2.32.3