Merge "Remove obsolete future imports"

swift/account/backend.py

@@ -16,7 +16,6 @@
 Pluggable Back-end for Account Server
 """
 
-from __future__ import with_statement
 import os
 from uuid import uuid4
 import time

swift/account/server.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
-
 import os
 import time
 import traceback

swift/common/db.py

@@ -15,7 +15,6 @@
 
 """ Database code for Swift """
 
-from __future__ import with_statement
 from contextlib import contextmanager, closing
 import hashlib
 import logging

swift/common/db_replicator.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
 import os
 import random
 import math

swift/common/manager.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
 import functools
 import errno
 import os

swift/container/backend.py

@@ -16,7 +16,6 @@
 Pluggable Back-ends for Container Server
 """
 
-from __future__ import with_statement
 import os
 from uuid import uuid4
 import time

swift/container/server.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
-
 import os
 import time
 import traceback

swift/obj/diskfile.py

@@ -30,7 +30,6 @@ The remaining methods in this module are considered implementation specifc and
 are also not considered part of the backend API.
 """
 
-from __future__ import with_statement
 import cPickle as pickle
 import errno
 import os

swift/obj/mem_diskfile.py

@@ -15,7 +15,6 @@
 
 """ In-Memory Disk File Interface for Swift Object Server"""
 
-from __future__ import with_statement
 import cStringIO
 import time
 import hashlib

swift/obj/mem_server.py

@@ -15,7 +15,6 @@
 
 """ In-Memory Object Server for Swift """
 
-from __future__ import with_statement
 import os
 from swift import gettext_ as _
 

swift/obj/server.py

@@ -15,7 +15,6 @@
 
 """ Object Server for Swift """
 
-from __future__ import with_statement
 import cPickle as pickle
 import os
 import multiprocessing

swift/obj/ssync_receiver.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
-
 import urllib
 
 import eventlet

swift/obj/ssync_sender.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
-
 import urllib
 
 import eventlet

test/unit/account/test_backend.py

@@ -15,7 +15,6 @@
 
 """ Tests for swift.account.backend """
 
-from __future__ import with_statement
 import hashlib
 import unittest
 from time import sleep, time

test/unit/common/test_db.py

@@ -15,7 +15,6 @@
 
 """Tests for swift.common.db"""
 
-from __future__ import with_statement
 import os
 import unittest
 from shutil import rmtree, copy

test/unit/common/test_memcached.py

@@ -16,7 +16,6 @@
 
 """Tests for swift.common.utils"""
 
-from __future__ import with_statement
 from collections import defaultdict
 import logging
 import socket

test/unit/common/test_utils.py

@@ -15,7 +15,6 @@
 
 """Tests for swift.common.utils"""
 
-from __future__ import with_statement
 from test.unit import temptree
 
 import ctypes

test/unit/common/test_wsgi.py

@@ -15,7 +15,6 @@
 
 """Tests for swift.common.wsgi"""
 
-from __future__ import with_statement
 import errno
 import logging
 import mimetools

test/unit/container/test_backend.py

@@ -15,7 +15,6 @@
 
 """ Tests for swift.container.backend """
 
-from __future__ import with_statement
 import hashlib
 import unittest
 from time import sleep, time

test/unit/obj/test_diskfile.py

@@ -16,8 +16,6 @@
 
 """Tests for swift.obj.diskfile"""
 
-from __future__ import with_statement
-
 import cPickle as pickle
 import os
 import errno

test/unit/obj/test_replicator.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
-
 import unittest
 import os
 import mock

test/unit/proxy/test_server.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import with_statement
 import cPickle as pickle
 import logging
 import os