Merge branch 'master' of github.com:pyfarm/pyfarm-master into fail_on…

…_pylint_errors
pyfarm · Sep 15, 2014 · 6954e61 · 6954e61
2 parents 041993c + 2c53e28
commit 6954e61
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pyfarm/master/api/tasklogs.py b/pyfarm/master/api/tasklogs.py
@@ -23,13 +23,17 @@
 """
 
 try:
-    from httplib import OK, NOT_FOUND, CONFLICT, TEMPORARY_REDIRECT, CREATED
+    from httplib import (
+      OK, NOT_FOUND, CONFLICT, TEMPORARY_REDIRECT, CREATED, BAD_REQUEST,
+      INTERNAL_SERVER_ERROR)
 except ImportError:  # pragma: no cover
-    from http.client import OK, NOT_FOUND, CONFLICT, TEMPORARY_REDIRECT, CREATED
+    from http.client import (
+      OK, NOT_FOUND, CONFLICT, TEMPORARY_REDIRECT, CREATED, BAD_REQUEST,
+      INTERNAL_SERVER_ERROR)
 
 import tempfile
 from os import makedirs
-from os.path import join, isfile, realpath
+from os.path import join, realpath
 from errno import EEXIST
 
 from flask.views import MethodView