diff --git a/swift/cli/account_audit.py b/swift/cli/account_audit.py index 5d7ff589ea..6e67fff8e6 100755 --- a/swift/cli/account_audit.py +++ b/swift/cli/account_audit.py @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import os import sys import getopt diff --git a/swift/cli/config.py b/swift/cli/config.py index 1a2db221ce..447f77520a 100755 --- a/swift/cli/config.py +++ b/swift/cli/config.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import optparse import os import sys diff --git a/swift/cli/dispersion_populate.py b/swift/cli/dispersion_populate.py index a54b155b5f..b9508f551c 100755 --- a/swift/cli/dispersion_populate.py +++ b/swift/cli/dispersion_populate.py @@ -13,7 +13,6 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import io import traceback diff --git a/swift/cli/dispersion_report.py b/swift/cli/dispersion_report.py index 270d1a0180..20b0f7e114 100644 --- a/swift/cli/dispersion_report.py +++ b/swift/cli/dispersion_report.py @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import json from collections import defaultdict from configparser import ConfigParser diff --git a/swift/cli/form_signature.py b/swift/cli/form_signature.py index f9c5bf1e00..7a8bff7250 100644 --- a/swift/cli/form_signature.py +++ b/swift/cli/form_signature.py @@ -15,7 +15,6 @@ """ Script for generating a form signature for use with FormPost middleware. """ -from __future__ import print_function import hmac from hashlib import sha1 from os.path import basename diff --git a/swift/cli/info.py b/swift/cli/info.py index 065b53d46c..8e8e487620 100644 --- a/swift/cli/info.py +++ b/swift/cli/info.py @@ -11,7 +11,6 @@ # under the License. -from __future__ import print_function import codecs import itertools import json diff --git a/swift/cli/manage_shard_ranges.py b/swift/cli/manage_shard_ranges.py index 0a8b7f1ce5..87c925c09a 100644 --- a/swift/cli/manage_shard_ranges.py +++ b/swift/cli/manage_shard_ranges.py @@ -155,7 +155,6 @@ All three steps may be performed with one sub-command:: Run container-sharder on all nodes to shard the container. """ -from __future__ import print_function import argparse import json import os.path diff --git a/swift/cli/orphans.py b/swift/cli/orphans.py index f819b2c220..d957afd7d4 100755 --- a/swift/cli/orphans.py +++ b/swift/cli/orphans.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import optparse import os import re diff --git a/swift/cli/recon.py b/swift/cli/recon.py index f17db3c5c5..d693be287a 100644 --- a/swift/cli/recon.py +++ b/swift/cli/recon.py @@ -15,7 +15,6 @@ cmdline utility to perform cluster reconnaissance """ -from __future__ import print_function from eventlet.green import socket from urllib.parse import urlparse diff --git a/swift/cli/reload.py b/swift/cli/reload.py index cecf26a3cd..9d84e39c71 100755 --- a/swift/cli/reload.py +++ b/swift/cli/reload.py @@ -22,7 +22,6 @@ Safely reload WSGI servers while minimizing client downtime and errors by * waiting for the reload to complete. """ -from __future__ import print_function import argparse import errno import os diff --git a/swift/cli/ringbuilder.py b/swift/cli/ringbuilder.py index 5cbb70c30c..98c182ad70 100644 --- a/swift/cli/ringbuilder.py +++ b/swift/cli/ringbuilder.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import logging from collections import defaultdict diff --git a/swift/cli/ringcomposer.py b/swift/cli/ringcomposer.py index 90cd3a25a2..99b7ce6ccf 100644 --- a/swift/cli/ringcomposer.py +++ b/swift/cli/ringcomposer.py @@ -65,7 +65,6 @@ For further details use:: swift-ring-composer -h """ -from __future__ import print_function import argparse import json import os diff --git a/swift/common/manager.py b/swift/common/manager.py index 80beecf46b..68dd2089a9 100644 --- a/swift/common/manager.py +++ b/swift/common/manager.py @@ -14,7 +14,6 @@ # limitations under the License. -from __future__ import print_function import functools import errno from optparse import OptionParser diff --git a/swift/common/middleware/tempauth.py b/swift/common/middleware/tempauth.py index e3b81c15c5..c5d39964af 100644 --- a/swift/common/middleware/tempauth.py +++ b/swift/common/middleware/tempauth.py @@ -173,7 +173,6 @@ To generate a curl command line from the above:: ' """ -from __future__ import print_function import json from time import time diff --git a/swift/common/utils/__init__.py b/swift/common/utils/__init__.py index 91c5b8b0aa..631a14f008 100644 --- a/swift/common/utils/__init__.py +++ b/swift/common/utils/__init__.py @@ -15,7 +15,6 @@ """Miscellaneous utility functions for use with Swift.""" -from __future__ import print_function import base64 import binascii diff --git a/swift/common/utils/logs.py b/swift/common/utils/logs.py index bb88a7ebbb..4181ca69ba 100644 --- a/swift/common/utils/logs.py +++ b/swift/common/utils/logs.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import errno import hashlib diff --git a/swift/common/wsgi.py b/swift/common/wsgi.py index 45e60f22c8..760a2215f4 100644 --- a/swift/common/wsgi.py +++ b/swift/common/wsgi.py @@ -15,7 +15,6 @@ """WSGI tools for use with swift.""" -from __future__ import print_function import errno import json diff --git a/swift/container/updater.py b/swift/container/updater.py index 46a8a06a87..27a4079a30 100644 --- a/swift/container/updater.py +++ b/swift/container/updater.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import logging import os import signal diff --git a/test/__init__.py b/test/__init__.py index ae17cdcb8d..b5f20f12e0 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import sys from contextlib import contextmanager diff --git a/test/functional/__init__.py b/test/functional/__init__.py index 73f3d4cb47..e51859b9c6 100644 --- a/test/functional/__init__.py +++ b/test/functional/__init__.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import configparser import contextlib diff --git a/test/probe/brain.py b/test/probe/brain.py index cdd29e1840..deeae9a607 100644 --- a/test/probe/brain.py +++ b/test/probe/brain.py @@ -11,7 +11,6 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import functools import sys from io import BytesIO diff --git a/test/probe/common.py b/test/probe/common.py index a6120c560b..e89c422e04 100644 --- a/test/probe/common.py +++ b/test/probe/common.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import errno import gc diff --git a/test/probe/test_object_handoff.py b/test/probe/test_object_handoff.py index 30a3a29642..a7e6a1de81 100644 --- a/test/probe/test_object_handoff.py +++ b/test/probe/test_object_handoff.py @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function from unittest import main from uuid import uuid4 diff --git a/test/unit/__init__.py b/test/unit/__init__.py index a8659b6762..09a8e7f94b 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -15,7 +15,6 @@ """ Swift tests """ -from __future__ import print_function import os import copy import logging diff --git a/test/unit/common/test_db_replicator.py b/test/unit/common/test_db_replicator.py index 39a1c3c510..8b01eee486 100644 --- a/test/unit/common/test_db_replicator.py +++ b/test/unit/common/test_db_replicator.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import unittest from contextlib import contextmanager diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py index 94dfb57118..667170b12d 100644 --- a/test/unit/common/test_manager.py +++ b/test/unit/common/test_manager.py @@ -12,7 +12,6 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import unittest from test.unit import temptree diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py index 0fea3287c7..ff60ffcc67 100644 --- a/test/unit/common/test_utils.py +++ b/test/unit/common/test_utils.py @@ -14,7 +14,6 @@ # limitations under the License. """Tests for swift.common.utils""" -from __future__ import print_function import argparse import hashlib diff --git a/test/unit/common/utils/test_logs.py b/test/unit/common/utils/test_logs.py index 04c24dfbc8..b991e27006 100644 --- a/test/unit/common/utils/test_logs.py +++ b/test/unit/common/utils/test_logs.py @@ -14,7 +14,6 @@ # limitations under the License. """Tests for swift.common.utils.logs""" -from __future__ import print_function import contextlib import errno diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py index f1b53423f4..d571545710 100644 --- a/test/unit/proxy/test_server.py +++ b/test/unit/proxy/test_server.py @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import email.parser import logging import json