fixes

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index e48083a3ae85f8cec7c7c8d1e64f6b84a134b99d..8694e978a436efc06effbbb5b4e3b81c5868d06f 100644 (file)
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -68,7 +68,7 @@ target_requests_outstanding = 10  # used by server
 cfg = ConfigParser()
 optparser = OptionParser()
 
 cfg = ConfigParser()
 optparser = OptionParser()
 

-_mimetrans = str.maketrans(b'-'+slip.esc, slip.esc+'-')
+_mimetrans = bytes.maketrans(b'-'+slip.esc, slip.esc+b'-')

 def mime_translate(s):
   # SLIP-encoded packets cannot contain ESC ESC.
   # Swap `-' and ESC.  The result cannot contain `--'
 def mime_translate(s):
   # SLIP-encoded packets cannot contain ESC ESC.
   # Swap `-' and ESC.  The result cannot contain `--'


@@ -145,7 +145,7 @@ class SlipStreamDecoder():
     self._maybe_packet(self._buffer)
     self._buffer = b''
 
     self._maybe_packet(self._buffer)
     self._buffer = b''
 

-class _IpifProcessProtocol(SlipProtocol):
+class _IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol):

   def __init__(self, router):
     self._router = router
     self._decoder = SlipStreamDecoder(self.slip_on_packet)
   def __init__(self, router):
     self._router = router
     self._decoder = SlipStreamDecoder(self.slip_on_packet)


@@ -224,7 +224,7 @@ def crash(err):
 def crash_on_defer(defer):
   defer.addErrback(lambda err: crash(err))
 
 def crash_on_defer(defer):
   defer.addErrback(lambda err: crash(err))
 

-vdef crash_on_critical(event):
+def crash_on_critical(event):

   if event.get('log_level') >= LogLevel.critical:
     crash(twisted.logger.formatEvent(event))
 
   if event.get('log_level') >= LogLevel.critical:
     crash(twisted.logger.formatEvent(event))