File size: 8,046 Bytes
5980447 |
1 2 |
{"repo": "noisyboiler/wampy", "pull_number": 61, "instance_id": "noisyboiler__wampy-61", "issue_numbers": "", "base_commit": "92f103784a49312584532931c7feffbca14f557c", "patch": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -37,14 +37,9 @@\n install_requires=[\n \"six==1.10.0\",\n \"simplejson==3.11.1\",\n+ \"gevent>=1.1\"\n ],\n extras_require={\n- ':python_version == \"2.7\"': [\n- \"eventlet<0.21.0\",\n- ],\n- ':python_version >= \"3\"': [\n- \"eventlet>=0.21.0\",\n- ],\n 'dev': [\n \"crossbar==0.15.0\",\n \"autobahn==0.17.2\",\ndiff --git a/wampy/__init__.py b/wampy/__init__.py\n--- a/wampy/__init__.py\n+++ b/wampy/__init__.py\n@@ -5,7 +5,7 @@\n # Set default logging handler to avoid \"No handler found\" warnings.\n import logging\n \n-import eventlet\n+import gevent.monkey\n \n \n try: # Python 2.7+\n@@ -21,5 +21,5 @@ def emit(self, record):\n root = logging.getLogger(__name__)\n root.addHandler(NullHandler())\n \n-root.warning('eventlet about to monkey patched your environment')\n-eventlet.monkey_patch()\n+root.warning('gevent about to monkey patched your environment')\n+gevent.monkey.patch_all()\ndiff --git a/wampy/session.py b/wampy/session.py\n--- a/wampy/session.py\n+++ b/wampy/session.py\n@@ -5,7 +5,8 @@\n import logging\n from functools import partial\n \n-import eventlet\n+import gevent\n+import gevent.queue\n \n from wampy.errors import ConnectionError, WampProtocolError\n from wampy.messages import MESSAGE_TYPE_MAP\n@@ -65,7 +66,7 @@ def __init__(self, client, router, connection, message_handler):\n # spawn a green thread to listen for incoming messages over\n # a connection and put them on a queue to be processed\n self._managed_thread = None\n- self._message_queue = eventlet.Queue()\n+ self._message_queue = gevent.queue.Queue()\n self._listen(self.connection, self._message_queue)\n \n @property\n@@ -114,8 +115,8 @@ def send_message(self, message_obj):\n \n def recv_message(self, timeout=5):\n try:\n- message = self._wait_for_message(timeout)\n- except eventlet.Timeout:\n+ message = self._message_queue.get(timeout=timeout)\n+ except gevent.queue.Empty:\n raise WampProtocolError(\n \"no message returned (timed-out in {})\".format(timeout)\n )\n@@ -163,33 +164,17 @@ def connection_handler():\n frame = connection.receive()\n if frame:\n message = frame.payload\n- handler = partial(\n- self.message_handler.handle_message,\n- message,\n- self.client\n- )\n- eventlet.spawn(handler)\n+ gevent.spawn(self.message_handler.handle_message,\n+ message, self.client)\n except (\n SystemExit, KeyboardInterrupt, ConnectionError,\n WampProtocolError,\n ):\n break\n \n- gthread = eventlet.spawn(connection_handler)\n+ gthread = gevent.spawn(connection_handler)\n self._managed_thread = gthread\n \n- def _wait_for_message(self, timeout):\n- q = self._message_queue\n-\n- with eventlet.Timeout(timeout):\n- while q.qsize() == 0:\n- # if the expected message is not there, switch context to\n- # allow other threads to continue working to fetch it for us\n- eventlet.sleep()\n-\n- message = q.get()\n- return message\n-\n def _subscribe_to_topic(self, handler, topic):\n message = Subscribe(topic=topic)\n request_id = message.request_id\ndiff --git a/wampy/transports/websocket/connection.py b/wampy/transports/websocket/connection.py\n--- a/wampy/transports/websocket/connection.py\n+++ b/wampy/transports/websocket/connection.py\n@@ -9,7 +9,7 @@\n from base64 import encodestring\n from socket import error as socket_error\n \n-import eventlet\n+import gevent\n \n from wampy.constants import WEBSOCKET_SUBPROTOCOLS, WEBSOCKET_VERSION\n from wampy.errors import (\n@@ -69,7 +69,7 @@ def receive(self, bufsize=1):\n \n try:\n bytes = self.socket.recv(bufsize)\n- except eventlet.greenlet.GreenletExit as exc:\n+ except gevent.greenlet.GreenletExit as exc:\n raise ConnectionError('Connection closed: \"{}\"'.format(exc))\n except socket.timeout as e:\n message = str(e)\n@@ -150,9 +150,9 @@ def _upgrade(self):\n self.socket.send(handshake.encode())\n \n try:\n- with eventlet.Timeout(5):\n+ with gevent.Timeout(5):\n self.status, self.headers = self._read_handshake_response()\n- except eventlet.Timeout:\n+ except gevent.Timeout:\n raise WampyError(\n 'No response after handshake \"{}\"'.format(handshake)\n )\n@@ -208,7 +208,7 @@ def read_line():\n while True:\n # we need this to guarantee we can context switch back to the\n # Timeout.\n- eventlet.sleep()\n+ gevent.sleep(0.01)\n \n received_bytes = read_line()\n if received_bytes == b'\\r\\n':\n", "test_patch": "diff --git a/test/helpers.py b/test/helpers.py\n--- a/test/helpers.py\n+++ b/test/helpers.py\n@@ -2,13 +2,13 @@\n # License, v. 2.0. If a copy of the MPL was not distributed with this\n # file, You can obtain one at http://mozilla.org/MPL/2.0/.\n \n-import eventlet\n+import gevent\n \n \n def assert_stops_raising(\n fn, exception_type=Exception, timeout=5, interval=0.1):\n \n- with eventlet.Timeout(timeout):\n+ with gevent.Timeout(timeout):\n while True:\n try:\n fn()\n@@ -16,4 +16,4 @@ def assert_stops_raising(\n pass\n else:\n return\n- eventlet.sleep(interval)\n+ gevent.sleep(interval)\ndiff --git a/wampy/testing/helpers.py b/wampy/testing/helpers.py\n--- a/wampy/testing/helpers.py\n+++ b/wampy/testing/helpers.py\n@@ -2,7 +2,7 @@\n # License, v. 2.0. If a copy of the MPL was not distributed with this\n # file, You can obtain one at http://mozilla.org/MPL/2.0/.\n \n-import eventlet\n+import gevent\n \n from wampy.message_handler import MessageHandler\n \n@@ -10,36 +10,36 @@\n \n \n def wait_for_subscriptions(client, number_of_subscriptions):\n- with eventlet.Timeout(TIMEOUT):\n+ with gevent.Timeout(TIMEOUT):\n while (\n len(client.session.subscription_map.keys())\n < number_of_subscriptions\n ):\n- eventlet.sleep()\n+ gevent.sleep(0.01)\n \n \n def wait_for_registrations(client, number_of_registrations):\n- with eventlet.Timeout(TIMEOUT):\n+ with gevent.Timeout(TIMEOUT):\n while (\n len(client.session.registration_map.keys())\n < number_of_registrations\n ):\n- eventlet.sleep()\n+ gevent.sleep(0.01)\n \n \n def wait_for_session(client):\n- with eventlet.Timeout(TIMEOUT):\n+ with gevent.Timeout(TIMEOUT):\n while client.session.id is None:\n- eventlet.sleep()\n+ gevent.sleep(0.01)\n \n \n def wait_for_messages(client, number_of_messages):\n messages_received = (\n client.session.message_handler.messages_received)\n \n- with eventlet.Timeout(TIMEOUT):\n+ with gevent.Timeout(TIMEOUT):\n while len(messages_received) < number_of_messages:\n- eventlet.sleep()\n+ gevent.sleep(0.01)\n \n return messages_received\n \n", "problem_statement": "", "hints_text": "", "created_at": "2018-03-07T06:36:26Z"}
|