Skip to content

Commit

Permalink
Fixed deprecation warnings:
Browse files Browse the repository at this point in the history
gevent.queue.Queue(0) now means infinity queue, changing to Channel instead.
gevent.coros module deprecated in favor of gevent.lock
  • Loading branch information
Paulo SantAnna committed Nov 22, 2013
1 parent e6e6ad2 commit 3778e0a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -5,3 +5,4 @@ dist/
*.egg
*.egg-info
.tox
.idea
2 changes: 1 addition & 1 deletion zerorpc/channel.py
Expand Up @@ -28,7 +28,7 @@
import gevent.queue
import gevent.event
import gevent.local
import gevent.coros
import gevent.lock

from .exceptions import TimeoutExpired

Expand Down
2 changes: 1 addition & 1 deletion zerorpc/core.py
Expand Up @@ -29,7 +29,7 @@
import gevent.queue
import gevent.event
import gevent.local
import gevent.coros
import gevent.lock

import gevent_zmq as zmq
from .exceptions import TimeoutExpired, RemoteError, LostRemote
Expand Down
6 changes: 3 additions & 3 deletions zerorpc/events.py
Expand Up @@ -28,7 +28,7 @@
import gevent.queue
import gevent.event
import gevent.local
import gevent.coros
import gevent.lock


import gevent_zmq as zmq
Expand All @@ -39,7 +39,7 @@ class Sender(object):

def __init__(self, socket):
self._socket = socket
self._send_queue = gevent.queue.Queue(maxsize=0)
self._send_queue = gevent.queue.Channel()
self._send_task = gevent.spawn(self._sender)

def __del__(self):
Expand Down Expand Up @@ -72,7 +72,7 @@ class Receiver(object):

def __init__(self, socket):
self._socket = socket
self._recv_queue = gevent.queue.Queue(maxsize=0)
self._recv_queue = gevent.queue.Channel()
self._recv_task = gevent.spawn(self._recver)

def __del__(self):
Expand Down
4 changes: 2 additions & 2 deletions zerorpc/heartbeat.py
Expand Up @@ -28,7 +28,7 @@
import gevent.queue
import gevent.event
import gevent.local
import gevent.coros
import gevent.lock

from .exceptions import *

Expand All @@ -38,7 +38,7 @@ class HeartBeatOnChannel(object):
def __init__(self, channel, freq=5, passive=False):
self._channel = channel
self._heartbeat_freq = freq
self._input_queue = gevent.queue.Queue(maxsize=0)
self._input_queue = gevent.queue.Channel()
self._remote_last_hb = None
self._lost_remote = False
self._recv_task = gevent.spawn(self._recver)
Expand Down

0 comments on commit 3778e0a

Please sign in to comment.