From 2c9a29a586fa7dd1688e9f4ce7fd485b52b2fb3f Mon Sep 17 00:00:00 2001 From: Kelly Truesdale Date: Wed, 25 Jul 2018 16:01:03 -0400 Subject: [PATCH] Shorten line lengths for recent changes. --- socketio/asyncio_redis_manager.py | 9 ++++++--- socketio/base_manager.py | 2 +- socketio/kombu_manager.py | 4 +++- tests/test_pubsub_manager.py | 6 ++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/socketio/asyncio_redis_manager.py b/socketio/asyncio_redis_manager.py index 619bebf..2265937 100644 --- a/socketio/asyncio_redis_manager.py +++ b/socketio/asyncio_redis_manager.py @@ -71,11 +71,13 @@ class AsyncRedisManager(AsyncPubSubManager): # pragma: no cover pickle.dumps(data)) except (aioredis.RedisError, OSError): if retry: - self._get_logger().error('Cannot publish to redis... retrying') + self._get_logger().error('Cannot publish to redis... ' + 'retrying') self.pub = None retry = False else: - self._get_logger().error('Cannot publish to redis... giving up') + self._get_logger().error('Cannot publish to redis... ' + 'giving up') break async def _listen(self): @@ -90,7 +92,8 @@ class AsyncRedisManager(AsyncPubSubManager): # pragma: no cover return await self.ch.get() except (aioredis.RedisError, OSError): self._get_logger().error('Cannot receive from redis... ' - 'retrying in {} secs'.format(retry_sleep)) + 'retrying in ' + '{} secs'.format(retry_sleep)) self.sub = None await asyncio.sleep(retry_sleep) retry_sleep *= 2 diff --git a/socketio/base_manager.py b/socketio/base_manager.py index c20b51a..b4bcf5f 100644 --- a/socketio/base_manager.py +++ b/socketio/base_manager.py @@ -165,7 +165,7 @@ class BaseManager(object): def _get_logger(self): """Get the appropriate logger - Prevents uninitialized servers in write-only mode failing because of a missing logger. + Prevents uninitialized servers in write-only mode from failing. """ if self.logger: diff --git a/socketio/kombu_manager.py b/socketio/kombu_manager.py index 6f46d77..4394a6d 100644 --- a/socketio/kombu_manager.py +++ b/socketio/kombu_manager.py @@ -43,7 +43,9 @@ class KombuManager(PubSubManager): # pragma: no cover raise RuntimeError('Kombu package is not installed ' '(Run "pip install kombu" in your ' 'virtualenv).') - super(KombuManager, self).__init__(channel=channel, write_only=write_only, logger=logger) + super(KombuManager, self).__init__(channel=channel, + write_only=write_only, + logger=logger) self.url = url self.producer = self._producer() diff --git a/tests/test_pubsub_manager.py b/tests/test_pubsub_manager.py index 66fb339..295151a 100644 --- a/tests/test_pubsub_manager.py +++ b/tests/test_pubsub_manager.py @@ -48,11 +48,13 @@ class TestBaseManager(unittest.TestCase): self.assertEqual(pm._get_logger(), logging.getLogger('socketio')) def test_write_only_with_provided_logger(self): - pm = pubsub_manager.PubSubManager(write_only=True, logger=logging.getLogger('new_logger')) + test_logger = logging.getLogger('new_logger') + pm = pubsub_manager.PubSubManager(write_only=True, + logger=test_logger) pm.initialize() self.assertEqual(pm.channel, 'socketio') self.assertEqual(len(pm.host_id), 32) - self.assertEqual(pm._get_logger(), logging.getLogger('new_logger')) + self.assertEqual(pm._get_logger(), test_logger) def test_emit(self): self.pm.emit('foo', 'bar')