Error class stores status in strings

but setResponseCode wants an int. tw16 started to enforce Error's status to be string, while before we always sent an int.
buildbot · Aug 17, 2016 · 4700668 · 4700668
1 parent 4e6c6de
commit 4700668
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/master/buildbot/test/util/www.py b/master/buildbot/test/util/www.py
@@ -78,6 +78,8 @@ def finish(self):
             self.deferred.callback(self.written)
 
     def setResponseCode(self, code):
+        # twisted > 16 started to assert this
+        assert isinstance(code, (int, long))
         self.responseCode = code
 
     def setHeader(self, hdr, value):

diff --git a/master/buildbot/www/resource.py b/master/buildbot/www/resource.py
@@ -84,7 +84,7 @@ def failHttpRedirect(f):
         def failHttpError(f):
             f.trap(Error)
             e = f.value
-            writeError(e.message, errcode=e.status)
+            writeError(e.message, errcode=int(e.status))
 
         @d.addErrback
         def fail(f):