Permalink
Browse files

Merge "Removed unused imports."

  • Loading branch information...
2 parents aa7a3a3 + b28cdbb commit e22ee457f01931111fa5e13946495f53fe79deb9 Jenkins committed with openstack-gerrit Apr 27, 2012
View
@@ -69,3 +69,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)
View
@@ -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
@@ -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
@@ -118,7 +118,7 @@
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, \
@@ -51,15 +51,11 @@
"""
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
@@ -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
View
@@ -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.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
@@ -29,7 +29,7 @@
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
View
@@ -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
View
@@ -48,7 +48,7 @@
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

0 comments on commit e22ee45

Please sign in to comment.