Skip to content

Commit 5e1391d

Browse files
Fixed initialize() method in PubSubManager subclasses
Fixes #406
1 parent edbbbf2 commit 5e1391d

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

socketio/kombu_manager.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,20 @@ def __init__(self, url='amqp://guest:guest@localhost:5672//',
4747
self.url = url
4848
self.producer = self._producer()
4949

50-
def initialize(self, server):
51-
super(KombuManager, self).initialize(server)
50+
def initialize(self):
51+
super(KombuManager, self).initialize()
5252

5353
monkey_patched = True
54-
if server.async_mode == 'eventlet':
54+
if self.server.async_mode == 'eventlet':
5555
from eventlet.patcher import is_monkey_patched
5656
monkey_patched = is_monkey_patched('socket')
57-
elif 'gevent' in server.async_mode:
57+
elif 'gevent' in self.server.async_mode:
5858
from gevent.monkey import is_module_patched
5959
monkey_patched = is_module_patched('socket')
6060
if not monkey_patched:
61-
raise RuntimeError('Redis requires a monkey patched socket '
62-
'library to work with ' + server.async_mode)
61+
raise RuntimeError(
62+
'Redis requires a monkey patched socket library to work '
63+
'with ' + self.server.async_mode)
6364

6465
def _connection(self):
6566
return kombu.Connection(self.url)

socketio/redis_manager.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,20 @@ def __init__(self, url='redis://localhost:6379/0', channel='socketio',
4343
super(RedisManager, self).__init__(channel=channel,
4444
write_only=write_only)
4545

46-
def initialize(self, server):
47-
super(RedisManager, self).initialize(server)
46+
def initialize(self):
47+
super(RedisManager, self).initialize()
4848

4949
monkey_patched = True
50-
if server.async_mode == 'eventlet':
50+
if self.server.async_mode == 'eventlet':
5151
from eventlet.patcher import is_monkey_patched
5252
monkey_patched = is_monkey_patched('socket')
53-
elif 'gevent' in server.async_mode:
53+
elif 'gevent' in self.server.async_mode:
5454
from gevent.monkey import is_module_patched
5555
monkey_patched = is_module_patched('socket')
5656
if not monkey_patched:
57-
raise RuntimeError('Redis requires a monkey patched socket '
58-
'library to work with ' + server.async_mode)
57+
raise RuntimeError(
58+
'Redis requires a monkey patched socket library to work '
59+
'with ' + self.server.async_mode)
5960

6061
def _publish(self, data):
6162
return self.redis.publish(self.channel, pickle.dumps(data))

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ basepython =
1818
pypy: pypy
1919

2020
[testenv:flake8]
21-
basepython=python
21+
basepython=python3.6
2222
deps=
2323
flake8
2424
commands=
@@ -35,7 +35,7 @@ commands=
3535
make html
3636

3737
[testenv:coverage]
38-
basepython=python
38+
basepython=python3.6
3939
commands=
4040
coverage run --branch --source=socketio setup.py test
4141
coverage html

0 commit comments

Comments
 (0)