py3: Port more CLI tools

Code Issues Proposed changes

Bring under test
 - test/unit/cli/test_dispersion_report.py
 - test/unit/cli/test_info.py and
 - test/unit/cli/test_relinker.py
I've verified that swift-*-info (at least) behave reasonably under
py3, even swift-object-info when there's non-utf8 metadata on the
data/meta file.
Change-Id: Ifed4b8059337c395e56f5e9f8d939c34fe4ff8dd

This commit is contained in:

Tim Burke

2018年02月22日 22:48:55 +00:00

parent 624b5310b4

commit 36c42974d6

11 changed files with 76 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8
bin/swift-object-info

View File

@@ -14,15 +14,23 @@

# See the License for the specific language governing permissions and

# limitations under the License.

import codecs

import sys

from optparse import OptionParser

import six

from swift.common.storage_policy import reload_storage_policies

from swift.common.utils import set_swift_dir

from swift.cli.info import print_obj, InfoSystemExit

if __name__ == '__main__':

if not six.PY2:

# Make stdout able to write escaped bytes

sys.stdout = codecs.getwriter("utf-8")(

sys.stdout.detach(), errors='surrogateescape')

parser = OptionParser('%prog [options] OBJECT_FILE')

parser.add_option(

'-n', '--no-check-etag', default=True,

py3: Port more CLI tools

8 bin/swift-object-info Unescape Escape View File

8
bin/swift-object-info

View File