diff --git a/AUTHORS b/AUTHORS index ea34009c..23d17041 100644 --- a/AUTHORS +++ b/AUTHORS @@ -67,3 +67,4 @@ Doug Weimer (dweimer@gmail.com) Cory Wright (cory.wright@rackspace.com) Ye Jia Xu (xyj.asmy@gmail.com) Pete Zaitcev (zaitcev@kotori.zaitcev.us) +Josh Kearney (josh@jk0.org) diff --git a/swift/account/auditor.py b/swift/account/auditor.py index b9f3172a..82052f1f 100644 --- a/swift/account/auditor.py +++ b/swift/account/auditor.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os import time from random import random diff --git a/swift/common/middleware/ratelimit.py b/swift/common/middleware/ratelimit.py index acfe75fe..86cf9e0d 100644 --- a/swift/common/middleware/ratelimit.py +++ b/swift/common/middleware/ratelimit.py @@ -14,7 +14,6 @@ import time import eventlet from webob import Request, Response -from webob.exc import HTTPNotFound from swift.common.utils import split_path, cache_from_env, get_logger from swift.proxy.server import get_container_memcache_key diff --git a/swift/common/middleware/staticweb.py b/swift/common/middleware/staticweb.py index 40f48c89..6fe7940e 100644 --- a/swift/common/middleware/staticweb.py +++ b/swift/common/middleware/staticweb.py @@ -118,7 +118,7 @@ import cgi import time from urllib import unquote, quote as urllib_quote -from webob import Response, Request +from webob import Response from webob.exc import HTTPMovedPermanently, HTTPNotFound from swift.common.utils import cache_from_env, get_logger, human_readable, \ diff --git a/swift/common/middleware/swift3.py b/swift/common/middleware/swift3.py index d8b862c7..2ca9d5b8 100644 --- a/swift/common/middleware/swift3.py +++ b/swift/common/middleware/swift3.py @@ -51,15 +51,11 @@ following for an SAIO setup:: """ from urllib import unquote, quote -import rfc822 -import hmac import base64 -import errno from xml.sax.saxutils import escape as xml_escape import urlparse from webob import Request, Response -from webob.exc import HTTPNotFound from simplejson import loads from swift.common.utils import split_path diff --git a/swift/container/auditor.py b/swift/container/auditor.py index 89855e2e..ff0cad4f 100644 --- a/swift/container/auditor.py +++ b/swift/container/auditor.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os import time from random import random diff --git a/swift/container/sync.py b/swift/container/sync.py index 441951d0..46ac1efd 100644 --- a/swift/container/sync.py +++ b/swift/container/sync.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os from time import ctime, time from random import random, shuffle from struct import unpack_from @@ -28,7 +27,7 @@ from swift.common.direct_client import direct_get_object from swift.common.ring import Ring from swift.common.db import ContainerBroker from swift.common.utils import audit_location_generator, get_logger, \ - hash_path, normalize_timestamp, TRUE_VALUES, validate_sync_to, whataremyips + hash_path, TRUE_VALUES, validate_sync_to, whataremyips from swift.common.daemon import Daemon diff --git a/swift/container/updater.py b/swift/container/updater.py index 6a9fd129..6c680ed5 100644 --- a/swift/container/updater.py +++ b/swift/container/updater.py @@ -29,7 +29,7 @@ from swift.common.bufferedhttp import http_connect from swift.common.db import ContainerBroker from swift.common.exceptions import ConnectionTimeout from swift.common.ring import Ring -from swift.common.utils import get_logger, whataremyips, TRUE_VALUES +from swift.common.utils import get_logger, TRUE_VALUES from swift.common.daemon import Daemon diff --git a/swift/obj/auditor.py b/swift/obj/auditor.py index 43c98c51..e77dfcff 100644 --- a/swift/obj/auditor.py +++ b/swift/obj/auditor.py @@ -15,16 +15,11 @@ import os import time -import uuid -import errno -from hashlib import md5 -from random import random from eventlet import Timeout from swift.obj import server as object_server -from swift.obj.replicator import invalidate_hash -from swift.common.utils import get_logger, renamer, audit_location_generator, \ +from swift.common.utils import get_logger, audit_location_generator, \ ratelimit_sleep, TRUE_VALUES from swift.common.exceptions import AuditException, DiskFileError, \ DiskFileNotExist diff --git a/swift/proxy/server.py b/swift/proxy/server.py index 1c9da3f1..3c768c1a 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -48,7 +48,7 @@ from eventlet.timeout import Timeout from webob.exc import HTTPAccepted, HTTPBadRequest, HTTPForbidden, \ HTTPMethodNotAllowed, HTTPNotFound, HTTPPreconditionFailed, \ HTTPRequestEntityTooLarge, HTTPRequestTimeout, HTTPServerError, \ - HTTPServiceUnavailable, HTTPUnprocessableEntity, status_map + HTTPServiceUnavailable, status_map from webob import Request, Response from swift.common.ring import Ring