--- a/mercurial/hgweb/request.py	Thu Oct 05 14:26:09 2017 -0400
+++ b/mercurial/hgweb/request.py	Thu Oct 05 14:27:21 2017 -0400
@@ -19,6 +19,7 @@
 )
 
 from .. import (
+    pycompat,
     util,
 )
 
@@ -89,6 +90,8 @@
             pass
 
     def respond(self, status, type, filename=None, body=None):
+        if not isinstance(type, str):
+            type = pycompat.sysstr(type)
         if self._start_response is not None:
             self.headers.append(('Content-Type', type))
             if filename: