From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 22 Mar 2017 23:51:27 +0000 (+0000)
Subject: fixes
X-Git-Tag: hippotat/1.0.0~55^2~207
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=commitdiff_plain;h=e4006ac49fd7aa465361d86d079c30b4cabf4593

fixes
---

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index e48083a..8694e97 100644
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -68,7 +68,7 @@ target_requests_outstanding = 10  # used by server
 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 `--'
@@ -145,7 +145,7 @@ class SlipStreamDecoder():
     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)
@@ -224,7 +224,7 @@ def 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))