Commit 7464f9d7 authored by Ziirish's avatar Ziirish

remove calls to gevent (see #316)

parent 83dfe548
......@@ -23,12 +23,6 @@ from ...utils import human_readable as _hr, utc_to_local
from ...exceptions import BUIserverException
from ..._compat import to_unicode
from threading import RLock as _RLock
try:
from gevent.lock import RLock
except ImportError:
RLock = _RLock
# Some functions are the same as in Burp1 backend
class Burp(Burp1):
......@@ -61,8 +55,6 @@ class Burp(Burp1):
:type conf: :class:`burpui.config.BUIConfig`
"""
self.plock = RLock()
BUIbackend.__init__(self, server, conf)
self.monitor = Monitor(self.burpbin, self.burpconfcli, self.app, self.timeout)
......@@ -134,8 +126,7 @@ class Burp(Burp1):
def status(self, query='c:\n', timeout=None, cache=True, agent=None):
"""See :func:`burpui.misc.backend.interface.BUIbackend.status`"""
with self.plock:
return self.monitor.status(query, timeout, cache)
return self.monitor.status(query, timeout, cache)
def _get_backup_logs(self, number, client, forward=False, deep=False):
"""See
......
......@@ -70,7 +70,7 @@ class human_readable(int):
# do the precision bit first, so width/alignment works with the suffix
if float(self) == 0:
return "{0:{1}f}".format(v, precis)
t = ("{0:{1}f}" + mult[i] + suffix).format(v, precis)
t = ("{0:{1}f} " + mult[i] + suffix).format(v, precis)
return "{0:{1}}".format(t, width) if width != "" else t
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment