diff --git a/api/api.py b/api/api.py index b115e004703fc082771a71c363b022e7b8a76f04..d8b3ec77f42268dad80493306730a1b5f184e061 100644 --- a/api/api.py +++ b/api/api.py @@ -1,7 +1,6 @@ import sys import json import webapp2 -import datetime import webapp2_extras.routes from . import core diff --git a/api/config.py b/api/config.py index b23021452123592e8d530e1d27e549bbbe20eee8..601e520d36d96c8ff669485cc0056522bd645deb 100644 --- a/api/config.py +++ b/api/config.py @@ -4,8 +4,6 @@ import logging import pymongo import datetime -from . import util - logging.basicConfig( format='%(asctime)s %(name)16.16s %(filename)24.24s %(lineno)5d:%(levelname)4.4s %(message)s', diff --git a/api/core.py b/api/core.py index 4f740994276d0e8163c66c57b547e4bad90f874f..df42a55d9862aac436c0a2e3e347c70c7e2934ee 100644 --- a/api/core.py +++ b/api/core.py @@ -1,10 +1,8 @@ import os import re -import cgi import bson import json import tarfile -import zipfile import datetime import markdown import cStringIO diff --git a/api/dao/reaperutil.py b/api/dao/reaperutil.py index 15d13ab3b2c3016d12a79a066eee5cc975616267..e166ccb1fb307bb5134082abb91e85b082547fd8 100644 --- a/api/dao/reaperutil.py +++ b/api/dao/reaperutil.py @@ -1,4 +1,3 @@ -import os import difflib import pymongo import datetime diff --git a/api/jobs.py b/api/jobs.py index 6edd951225cdc9991c0c2d89de5409c2256728a3..0274fd10515df385a3ffe137362b29ab726c95e2 100644 --- a/api/jobs.py +++ b/api/jobs.py @@ -5,9 +5,6 @@ API request handlers for process-job-handling. # We shadow the standard library; this is a workaround. from __future__ import absolute_import -import logging -log = logging.getLogger('scitran.api.jobs') - import bson import pymongo import datetime @@ -16,6 +13,8 @@ from collections import namedtuple from . import base from . import config +log = config.log + JOB_STATES = [ 'pending', # Job is queued diff --git a/api/rules.py b/api/rules.py index 544c35a9c078d489d306611d0d38546f86f7d164..02da82b231d9a26fd2af7ac9025aa687b599df9a 100644 --- a/api/rules.py +++ b/api/rules.py @@ -1,15 +1,9 @@ - -import logging -log = logging.getLogger('scitran.api.jobs') - -import bson -import pymongo -import datetime import fnmatch -from . import base -from . import util from . import jobs +from . import config + +log = config.log # diff --git a/api/util.py b/api/util.py index df8c863fb02bd1cf4b5d0ec0ebb8606d2f70dd18..7f18fee4265f542b15fae69020f3a2670e99c5b0 100644 --- a/api/util.py +++ b/api/util.py @@ -1,12 +1,6 @@ import os -import copy import pytz import uuid -import shutil -import difflib -import hashlib -import pymongo -import zipfile import datetime import mimetypes import bson.objectid