From ad0f20ccb2bf9d4e2fda346a061dcfd8342f7561 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 14 Sep 2015 17:50:32 -0400 Subject: [pkg] revert attempt to be compatible with logbook 0.6.0 we need the 'multi' feature all the same, so we'll be depending on logbook >= 0.7.0. --- src/leap/bitmask/logs/safezmqhandler.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/leap/bitmask/logs/safezmqhandler.py b/src/leap/bitmask/logs/safezmqhandler.py index 6d2c4f50..4e5f59e4 100644 --- a/src/leap/bitmask/logs/safezmqhandler.py +++ b/src/leap/bitmask/logs/safezmqhandler.py @@ -19,11 +19,9 @@ A thread-safe zmq handler for LogBook. """ import json import threading -from distutils.version import LooseVersion from logbook.queues import ZeroMQHandler from logbook import NOTSET -from logbook import __version__ as LOGBOOK_VERSION import zmq @@ -55,12 +53,7 @@ class SafeZMQHandler(ZeroMQHandler): # instead of calling the ZeroMQHandler's one. # The best approach may be to inherit directly from `logbook.Handler`. - args = (self, uri, level, filter, bubble, context) - - # Workaround for an API change: version 0.6.0 in trusty doesn't accepts - # the multi parameter. - if LooseVersion(LOGBOOK_VERSION) >= LooseVersion('0.7.0'): - args += (multi,) + args = (self, uri, level, filter, bubble, context, multi) ZeroMQHandler.__init__(*args) current_id = self._get_caller_id() -- cgit v1.2.3