Skip to content

Commit

Permalink
Merge pull request #186 from pyfarm/fix_missing_imports
Browse files Browse the repository at this point in the history
Fix Missing Imports
  • Loading branch information
opalmer committed Sep 15, 2014
2 parents b501604 + 445ede0 commit 2c53e28
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pyfarm/master/api/tasklogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2c53e28

Please sign in to comment.